aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-175-301/+301
|\
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-173-329/+329
| |\
| | * Replaced Dutch po file by Spanish po file by accident. Had no visible impact.jeroenpraat2015-08-171-2075/+2071
| | * Final Spanish strings for nowjeroenpraat2015-08-172-297/+297
| | * Fixed Spanish stringsjeroenpraat2015-08-171-2103/+2107
| * | commit 631eb4b broke the checkboxes in admin/site, so separate normal checkbo...redmatrix2015-08-173-4/+4
| |/
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-162-3/+8
|\|
| * issue #386 - account and channel bulk edit checkboxes not visible and therefo...redmatrix2015-08-162-3/+8
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-142-17/+17
|\|
| * update spanishjeroenpraat2015-08-142-17/+17
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-1211-11288/+19620
|\|
| * Some corrections of Spanish strings.jeroenpraat2015-08-122-135/+136
| * And Catalan!jeroenpraat2015-08-122-6006/+9675
| * Thanks to Manuel. Updated Spanish to 100 procent.jeroenpraat2015-08-129-5281/+9942
| * Update Dutch stringsjeroenpraat2015-08-092-12/+17
| * Update Dutch stringsjeroenpraat2015-08-052-1465/+1379
| * Merge pull request #382 from tuscanhobbit/masterPaolo T2015-08-032-1354/+1266
| |\
| | * Italian translationPaolo Tacconi2015-08-032-1354/+1266
* | | forum widgetredmatrix2015-08-111-0/+1
* | | more work separating Diaspora from coreredmatrix2015-08-032-24/+0
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-311-1/+1
|\| |
| * | consistency of event formredmatrix2015-07-311-1/+1
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-271-6/+5
|\| |
| * | align buttons on event calendarredmatrix2015-07-271-6/+5
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-271-0/+13
|\| |
| * | crude but more or less functional event import from thunderbird ics filesredmatrix2015-07-261-0/+13
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-261-0/+9
|\| |
| * | Provide connection status if status is "a-normal"Mario Vavti2015-07-261-0/+9
| * | update pt-br stringsAlexandre Hannud Abdo2015-07-242-3156/+3297
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-212-3/+8
|\| |
| * | Fixes regarding the new default profile photo size. The default profile photo...Mario Vavti2015-07-201-1/+1
| * | show icons instead of disabled checkboxesMario Vavti2015-07-201-2/+7
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-191-45/+32
|\| |
| * | fix missing div and a regression introduced in ec23a94b6d7f6db1e1d34275b8143c...Mario Vavti2015-07-161-45/+32
| * | Merge pull request #376 from tuscanhobbit/masterPaolo T2015-07-162-305/+369
| |\|
| | * Updated Italian stringsPaolo Tacconi2015-07-162-305/+369
* | | the view_photos and post_photos permissions are redundant and are now mapped ...redmatrix2015-07-192-9/+0
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-152-5/+8
|\| |
| * | show inherited state in Connection Default PermissionsMario Vavti2015-07-152-5/+8
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-147-437/+268
|\| |
| * | make strings translateableMario Vavti2015-07-141-6/+6
| * | 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
| * | css fixesMario Vavti2015-07-141-5/+1
| * | cleanup conneditMario Vavti2015-07-147-469/+270
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-132-3/+3
|\| |
| * | fix sys channel menu in a morre standard wayMario Vavti2015-07-121-1/+1
| * | make menu creation for sys channel workMario Vavti2015-07-122-3/+3
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-113-16/+23
|\| |