aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-071-6/+9
|\ | | | | | | | | Conflicts: util/messages.po
| * uexport template fixesMario Vavti2015-09-041-6/+9
| |
* | Always open rpost editor on document readyredmatrix2015-09-061-0/+1
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-023-3/+15
|\|
| * more adjustment to apps containersredmatrix2015-09-021-2/+3
| |
| * sort out some app display weirdnessredmatrix2015-09-023-3/+14
| |
| * increase height of app-container so edit controls aren't shadowedredmatrix2015-09-021-1/+1
| |
* | provide consistent ui for thingsredmatrix2015-09-014-2/+20
| |
* | separate objs/things from taxonomyredmatrix2015-09-011-4/+4
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-313-187/+194
|\| | | | | | | | | | | | | | | Conflicts: include/identity.php install/update.php util/messages.po view/nl/messages.po
| * Removed redmatrix.nl as a fallback server (directory mode to normal) + ↵jeroenpraat2015-08-292-55/+55
| | | | | | | | update strings ES
| * Update es and nl stringsjeroenpraat2015-08-284-245/+257
| |
* | more work on doco searchredmatrix2015-08-302-0/+11
| |
* | this is weirdredmatrix2015-08-253-5/+5
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-232-743/+743
|\| | | | | | | | | | | | | Conflicts: include/zot.php install/update.php util/messages.po
| * Final (temporary I suppose) Spanish string updatejeroenpraat2015-08-222-743/+743
| |
* | change name of moduleredmatrix2015-08-223-5/+5
| |
* | increase width of tasklist input elementredmatrix2015-08-221-1/+5
| |
* | limit the height of tasklistredmatrix2015-08-201-0/+8
| |
* | put tasklist into events page comanche layoutredmatrix2015-08-201-0/+3
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-202-105/+105
|\|
| * Another Spanish strings updatejeroenpraat2015-08-202-105/+105
| |
* | some event related fixes and some base work for implementing native tasks ↵redmatrix2015-08-201-8/+1
| | | | | | | | (to-do lists); which should already be importable and exportable.
* | issues encountered whilst testing import_items module using yearly dump filesredmatrix2015-08-171-1/+1
| |
* | provide module for importing yearly content dumpsredmatrix2015-08-171-0/+15
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-175-301/+301
|\| | | | | | | | | Conflicts: view/nl/messages.po
| * 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 ↵redmatrix2015-08-173-4/+4
| |/ | | | | | | checkboxes from bulk edit checkboxes in the css
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-162-3/+8
|\|
| * issue #386 - account and channel bulk edit checkboxes not visible and ↵redmatrix2015-08-162-3/+8
| | | | | | | | therefore not useable. Also change wording to remove the offensive 'user' designation.
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-142-17/+17
|\| | | | | | | | | | | Conflicts: include/zot.php util/messages.po
| * update spanishjeroenpraat2015-08-142-17/+17
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-1211-11288/+19620
|\| | | | | | | | | | | Conflicts: view/es/htconfig.tpl view/es/update_fail_eml.tpl
| * 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 translation
| | * 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
|\| | | | | | | | | | | | | | Conflicts: util/messages.po
| * | 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
|\| | | | | | | | | | | | | | Conflicts: util/messages.po