aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-1022-135/+164
|\
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-1023-409/+499
| |\
| | * Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-07-102-274/+336
| | |\
| | | * update Dutch stringsjeroenpraat2015-07-102-274/+336
| | * | show status editor in /display on share action.Mario Vavti2015-07-101-1/+4
| | |/
| | * css fixesMario Vavti2015-07-101-2/+8
| | * do not change selected/active class color on hoverMario Vavti2015-07-101-1/+10
| | * re-enable selected/active classMario Vavti2015-07-101-4/+3
| | * more webpages - generic-content-wrapper fixesMario Vavti2015-07-106-79/+90
| | * add generic content wrapper to post/webpage editor and make editpost render c...Mario Vavti2015-07-103-20/+20
| | * schema focus: refine content width to be more in balance with the recent asid...Mario Vavti2015-07-101-1/+1
| | * move section and aside padding from default.css to style.cssMario Vavti2015-07-104-8/+6
| | * revertMario Vavti2015-07-091-2/+2
| | * fix vcard title spacingMario Vavti2015-07-091-1/+2
| | * do not show status editor in /display - we most probably want to read the thr...Mario Vavti2015-07-091-1/+2
| | * fix aside width for collapsed stateMario Vavti2015-07-092-2/+2
| | * move profile image up and refine the aside widthMario Vavti2015-07-096-11/+11
| | * remove paddingMario Vavti2015-07-091-1/+0
| | * increase width of the aside area and make default profile image size 300x300Mario Vavti2015-07-097-11/+12
| | * fix typo to make directory safe mode default to on work againMario Vavti2015-07-081-1/+1
| * | revision updateredmatrix2015-07-102-169/+171
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-0715-87/+80
| |\|
| * | version updateredmatrix2015-07-071-1/+1
* | | inconsistent naming of block item typesredmatrix2015-07-084-6/+6
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-0715-87/+80
|\ \ \ | | |/ | |/|
| * | fix sorting of channel suggestionsMario Vavti2015-07-073-5/+6
| * | rename function get_directory_settings => get_directory_setting and move sort...Mario Vavti2015-07-075-32/+26
| * | make public forums only setting sticky and simplify function to get directory...Mario Vavti2015-07-073-39/+34
| * | code style correctionMario Vavti2015-07-071-3/+2
| * | make directory suggest work with directory optionsMario Vavti2015-07-072-3/+7
| * | schema focus: adjust width to match photo width in /photosMario Vavti2015-07-071-1/+1
| * | various css fixesMario Vavti2015-07-077-15/+8
| * | more word wrap fixesMario Vavti2015-07-071-0/+2
| * | move if clause outside of the divMario Vavti2015-07-071-2/+2
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-07-071-1/+1
| |\|
| * | use default style for default webpageMario Vavti2015-07-071-7/+12
* | | Merge branch 'master' of https://github.com/redmatrix/hubzillaredmatrix2015-07-071-1/+1
|\ \ \
| * \ \ Merge pull request #4 from git-marijus/masterredmatrix2015-07-081-1/+1
| |\ \ \
| | * | | abook_pending should probably be 1 in this placeMario Vavti2015-07-061-1/+1
* | | | | incorrect value for hubloc_deleted in zot_get_hublocs() queryredmatrix2015-07-071-1/+1
|/ / / /
* | | | incorrectly named doc fileredmatrix2015-07-061-0/+0
* | | | ok that's wretchedly inefficient but provides a basic relevance search for st...redmatrix2015-07-062-2/+34
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-062-1/+5
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-061-0/+4
| |\ \ \ | | | |/ | | |/|
| | * | fix word wrapping in tagblock and dirtagblock and possibly other placesMario Vavti2015-07-061-0/+4
| * | | version updateredmatrix2015-07-061-1/+1
| |/ /
* | / Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-052-2/+2
|\| | | |/ |/|
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-051-1/+1
| |\
| | * schema focus: adjust default widthMario Vavti2015-07-051-1/+1
| * | version updateredmatrix2015-07-051-1/+1
| |/