aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix missing div and a regression introduced in ↵Mario Vavti2015-07-162-50/+37
| | | | ec23a94b6d7f6db1e1d34275b8143cbc947db802 which broke tag removal for photos
* Merge pull request #376 from tuscanhobbit/masterPaolo T2015-07-162-305/+369
|\ | | | | Updated Italian strings
| * Updated Italian stringsPaolo Tacconi2015-07-162-305/+369
| |
* | allow plugins to provide module handlers for arbitrary modules that haven't ↵redmatrix2015-07-152-0/+13
| | | | | | | | been installed on the system.
* | fix for empty recip array resulting from a mangled xchanredmatrix2015-07-151-5/+8
| |
* | clone sync fixes across red/hzredmatrix2015-07-151-2/+7
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-159-15/+19
|\ \
| * \ Merge pull request #375 from zzottel/masterredmatrix2015-07-166-6/+6
| |\ \ | | | | | | | | change sh to bash in shebang to make scripts work
| | * | also change the update_ scriptszottel2015-07-153-3/+3
| | | |
| | * | change sh to bash in shebang to make scripts workzottel2015-07-153-3/+3
| |/ /
| * | provide info text for automatic permissionsMario Vavti2015-07-151-1/+1
| | |
| * | whitespaceMario Vavti2015-07-151-4/+0
| | |
| * | show inherited state in Connection Default PermissionsMario Vavti2015-07-153-7/+15
| | |
* | | revision updateredmatrix2015-07-151-1/+1
|/ /
* | fix import of group membersredmatrix2015-07-141-1/+1
| |
* | stream_perms_xchans() set to empty quoted string when no results rather than ↵redmatrix2015-07-141-0/+6
| | | | | | | | return an empty string
* | 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
| | |
| * | 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
| |/ /
* / / 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.
* | 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
|\ \
| * \ Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-113-16/+23
| |\ \
| * | | revision updateredmatrix2015-07-111-1/+1
| | | |
* | | | make menu creation for sys channel workMario Vavti2015-07-124-10/+5
| |/ / |/| |
* | | 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
|\| |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-1023-409/+499
| |\ \
| * | | 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
| | | | |
* | | | | add css file for mod displayMario Vavti2015-07-111-0/+3
| |_|/ / |/| | |
* | | | 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
|/ / / /