aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | 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)
| * | | PRIVACY: possible privacy leakage under a defined set of circumstancesredmatrix2015-05-201-0/+3
| |/ /
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-191-52/+56
|\| | | | | | | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php
| * | New update Dutchjeroenpraat2015-05-192-104/+104
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-183-128/+128
|\| | | | | | | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php
| * | Update Dutch (Projectname variable not translated yet, because of undefined ↵jeroenpraat2015-05-182-383/+390
| | | | | | | | | | | | variable)
* | | Merge branch 'master' into tresredmatrix2015-05-174-23/+23
|\ \ \
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-174-23/+23
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/bb2diaspora.php include/diaspora.php include/enotify.php mod/admin.php mod/cloud.php mod/dav.php mod/home.php mod/invite.php mod/like.php mod/mitem.php mod/p.php mod/pubsites.php mod/setup.php mod/siteinfo.php util/messages.po
| | * | updated the templates to the {{}}, compared toRazlo2015-05-174-23/+23
| | | |
* | | | Merge branch 'master' into tresredmatrix2015-05-141-4/+3
|\| | |
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-141-4/+3
| |\| |
| | * | Add sprintf.js v1.0.2.Klaus Weidenbach2015-05-141-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This script provides sprintf() for JavaScript. It can be used for example for translating strings used in JavaScript with variables. It is licensed under BSD-3-Clause and can be found on GitHub: https://github.com/alexei/sprintf.js
| | * | Dutch 100\% againjeroenpraat2015-05-122-56/+76
| | | |
| | * | update pt-br transationAlexandre Hannud Abdo2015-05-112-6099/+7075
| | | |
* | | | Merge branch 'master' into tresredmatrix2015-05-1456-8598/+8554
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Import/refimport.php include/activities.php include/attach.php include/event.php include/externals.php include/identity.php include/items.php include/notifier.php include/photos.php include/taxonomy.php include/zot.php mod/channel.php mod/connedit.php mod/events.php mod/item.php mod/like.php mod/manage.php mod/mood.php mod/ping.php mod/poke.php mod/subthread.php mod/tagger.php mod/thing.php
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-109-74/+86
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mod/mitem.php view/de/messages.po view/de/strings.php
| | * | provide drop down submenu suggestions in edit modeMario Vavti2015-05-101-0/+2
| | | |
| | * | copy/paste typoMario Vavti2015-05-101-1/+1
| | | |
| | * | provide ability to create submenusMario Vavti2015-05-106-8/+18
| | | |
| | * | update to German stringszottel2015-05-082-5226/+5453
| | | |
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-075-227/+242
| |\| |
| | * | provide wrap variable for comanche menusMario Vavti2015-05-071-1/+5
| | | |
| | * | Update Dutchjeroenpraat2015-05-072-221/+232
| | | |