aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* more photos workredmatrix2015-06-171-1/+1
|
* lots of work on merging photo and file albums/foldersredmatrix2015-06-171-0/+3
|
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-154-158/+187
|\ | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php
| * Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-06-152-6998/+7222
| |\
| | * Update Dutch language stringsjeroenpraat2015-06-152-6998/+7222
| | |
| * | update spin.jsMario Vavti2015-06-152-157/+184
| |/
| * do not allow/show acl button on photo edit if not ownerMario Vavti2015-06-152-1/+3
| |
* | more work on itemsredmatrix2015-06-115-6/+19
|\| | | | | | | | | | | | | | | | | | | | | and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/strings.php
| * Merge pull request #347 from tuscanhobbit/devPaolo T2015-06-112-7219/+7160
| |\ | | | | | | updated italian strings
| | * updated italian stringsPaolo Tacconi2015-06-112-7219/+7160
| | |
| * | set width for region_3 only if center page content is setMario Vavti2015-06-113-4/+15
| | |
| * | fix rendering of affinity sliderMario Vavti2015-06-112-2/+4
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-104-11/+18
|\| |
| * | assign right aside the same width as we have in left aside but hide it on ↵Mario Vavti2015-06-104-11/+18
| | | | | | | | | | | | small and xs screens. make aside width a variablee for easier handling.
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-092-0/+2
|\| |
| * | put mirror_frontpage setting into admin/siteredmatrix2015-06-091-0/+1
| | |
| * | toggle diaspora protocol on a per-channel level in addition to the existing ↵redmatrix2015-06-091-0/+1
| | | | | | | | | | | | per site setting. Default is enabled if the site setting is enabled.
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-093-2/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/home.php mod/page.php view/nl/messages.po view/nl/strings.php
| * | css regression fixesMario Vavti2015-06-081-0/+12
| | |
| * | Merge branch 'frontpage'redmatrix2015-06-072-2/+3
| |\ \
| | * | more frontpage tweaksredmatrix2015-06-071-1/+1
| | | |
| | * | reverse logic of homepage login settingredmatrix2015-06-071-1/+1
| | | |
| | * | frontpage tweaksredmatrix2015-06-071-0/+1
| | | |
| | * | frontpage changesredmatrix2015-06-071-1/+1
| | | |
| * | | Upd NLjeroenpraat2015-06-072-7229/+7132
| |/ /
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-0611-793/+619
|\| | | | | | | | | | | | | | Conflicts: util/messages.po
| * | missing commaMario Vavti2015-06-061-1/+1
| | |
| * | Added translatable strings to the Display Settings page and refreshed ↵jeroenpraat2015-06-061-3/+3
| | | | | | | | | | | | util/messages.po.
| * | css fixesMario Vavti2015-06-061-17/+9
| | |
| * | whitespaceMario Vavti2015-06-061-169/+175
| | |
| * | some cleanup after scheme transitionMario Vavti2015-06-062-196/+19
| | |
| * | More schemas in new formatjeroenpraat2015-06-054-119/+114
| | |
| * | Schemas: should be ok now.jeroenpraat2015-06-037-342/+116
| | |
| * | 2 more schemas in new formatjeroenpraat2015-06-034-239/+473
| | |
| * | empty php schema backjeroenpraat2015-06-031-0/+2
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-022-123/+237
|\| |
| * | First schema completely to the new format. git-marijus: Can you please ↵jeroenpraat2015-06-022-123/+237
| | | | | | | | | | | | quickly check if I'm doing it right?
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-314-10/+29
|\| |
| * | add some yes/no labels and minor template fixesMario Vavti2015-05-292-3/+3
| | |
| * | some fixes to make menu sharing work and expose it in the ui.Mario Vavti2015-05-292-12/+14
| | |
| * | show created/edited dates for menusMario Vavti2015-05-292-3/+20
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-282-2496/+3962
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/impel.php view/pt-br/messages.po view/pt-br/strings.php
| * | update pt_BR translationAlexandre Hannud Abdo2015-05-282-1021/+1031
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-252-1/+3
|\| |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-251-0/+1
| |\ \
| | * | add this to better support mobile devices out of the box in zen templateMario Vavti2015-05-251-0/+1
| | | |
| * | | add toggle for ALLOWCODE to admin/channel and also fix the ability to toggle ↵redmatrix2015-05-251-1/+2
| |/ / | | | | | | | | | the censor flag from that page.
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-203-72/+76
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/items.php include/text.php mod/item.php view/nl/messages.po
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-202-71/+71
| |\ \
| | * | Another update for Dutch with complete $Projectname substitutions (and ↵jeroenpraat2015-05-202-71/+71
| | | | | | | | | | | | | | | | channel activity as suggested on previous discussion)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 16:19:26 +0000