aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-141-0/+6
|\
| * stream_perms_xchans() set to empty quoted string when no results rather than ↵redmatrix2015-07-141-0/+6
| | | | | | | | return an empty string
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-1413-521/+319
|\| | | | | | | | | Conflicts: mod/connedit.php
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-1410-518/+331
| |\
| | * make strings translateableMario Vavti2015-07-142-6/+12
| | |
| | * disable the inherited checkboxes for notselfMario Vavti2015-07-141-1/+1
| | |
| | * fix mod_connedit.js after cleanupMario Vavti2015-07-142-1/+35
| | |
| | * revert this until further investigationMario Vavti2015-07-141-1/+1
| | |
| | * revert provide inherited perms for connection default permissionsMario Vavti2015-07-141-1/+1
| | |
| | * remove dbgMario Vavti2015-07-141-2/+0
| | |
| | * provide inherited perms for connection default permissionsMario Vavti2015-07-141-1/+3
| | |
| | * css fixesMario Vavti2015-07-141-5/+1
| | |
| | * cleanup conneditMario Vavti2015-07-149-550/+309
| | |
| * | coverup and ignore the illegal string offset message that some sites have ↵redmatrix2015-07-143-3/+5
| | | | | | | | | | | | been reporting. This does not fix it. A fix would be to examine the data that has been received and find out why it is mangled and trace this back to where it was mangled.
* | | Merge branch 'master' of https://github.com/redmatrix/hubzillaredmatrix2015-07-131-1/+0
|\ \ \
| * \ \ Merge pull request #14 from git-marijus/masterredmatrix2015-07-124-17/+23
| |\ \ \ | | | | | | | | | | Merge remote-tracking branch 'redmatrix/master'
| | * \ \ Merge remote-tracking branch 'redmatrix/master'Mario Vavti2015-07-111-6/+6
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'redmatrix/master'Mario Vavti2015-07-112-10/+14
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'redmatrix/master'Mario Vavti2015-07-111-0/+3
| | |\ \ \ \ \
| | * \ \ \ \ \ mergeMario Vavti2015-07-112-2/+5
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | merge redmatrix fixesMario Vavti2015-07-1021-134/+159
| | |\ \ \ \ \ \
* | | | | | | | | merge from redmatrixredmatrix2015-07-131-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-136-11/+30
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge pull request #373 from zzottel/masterredmatrix2015-07-141-0/+18
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | change account_default_channel if default channel is removed
| | * | | | | | | change account_default_channel if default channel is removedzottel2015-07-131-0/+18
| |/ / / / / / /
| * | | | | | | Only let local logins install webpage elementsredmatrix2015-07-111-1/+5
| | | | | | | |
| * | | | | | | allow sys editing of menuredmatrix2015-07-111-0/+1
| | | | | | | |
| * | | | | | | whitespace and comment out info againMario Vavti2015-07-122-3/+3
| | | | | | | |
| * | | | | | | fix sys channel menu in a morre standard wayMario Vavti2015-07-123-5/+5
| | | | | | | |
| * | | | | | | menu_id is still neededMario Vavti2015-07-121-0/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-07-121-1/+1
| |\ \ \ \ \ \ \
| * | | | | | | | make menu creation for sys channel workMario Vavti2015-07-124-10/+5
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-114-17/+24
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | |_|/ / / / / |/| | | | | |
| * | | | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-113-16/+23
| |\| | | | |
| | * | | | | fix issue with profile photoMario Vavti2015-07-111-6/+6
| | | |_|_|/ | | |/| | |
| | * | | | more revertMario Vavti2015-07-111-5/+0
| | | | | |
| | * | | | revert moving section and aside padding to style.css - it brings trouble to ↵Mario Vavti2015-07-112-5/+14
| | | |_|/ | | |/| | | | | | | | | | | | other layouts
| | * | | Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-07-112-169/+171
| | |\ \ \
| | * | | | add css file for mod displayMario Vavti2015-07-111-0/+3
| | | | | |
| * | | | | revision updateredmatrix2015-07-111-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-1022-135/+164
|\| | | | | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: mod/editpost.php util/messages.po view/nl/messages.po view/nl/strings.php
| * | | 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 ↵Mario Vavti2015-07-103-20/+20
| | | | | | | | | | | | correctly
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 14:39:01 +0000