Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-28 | 2 | -2496/+3962 |
|\ | | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/impel.php view/pt-br/messages.po view/pt-br/strings.php | ||||
| * | update pt_BR translation | Alexandre Hannud Abdo | 2015-05-28 | 2 | -1021/+1031 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-25 | 2 | -1/+3 |
|\| | |||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-25 | 1 | -0/+1 |
| |\ | |||||
| | * | add this to better support mobile devices out of the box in zen template | Mario Vavti | 2015-05-25 | 1 | -0/+1 |
| | | | |||||
| * | | add toggle for ALLOWCODE to admin/channel and also fix the ability to toggle ↵ | redmatrix | 2015-05-25 | 1 | -1/+2 |
| |/ | | | | | | | the censor flag from that page. | ||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-20 | 3 | -72/+76 |
|\| | | | | | | | | | | | | | | | Conflicts: include/items.php include/text.php mod/item.php view/nl/messages.po | ||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-20 | 2 | -71/+71 |
| |\ | |||||
| | * | Another update for Dutch with complete $Projectname substitutions (and ↵ | jeroenpraat | 2015-05-20 | 2 | -71/+71 |
| | | | | | | | | | | | | channel activity as suggested on previous discussion) | ||||
| * | | PRIVACY: possible privacy leakage under a defined set of circumstances | redmatrix | 2015-05-20 | 1 | -0/+3 |
| |/ | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-19 | 1 | -52/+56 |
|\| | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php | ||||
| * | New update Dutch | jeroenpraat | 2015-05-19 | 2 | -104/+104 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-18 | 3 | -128/+128 |
|\| | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php | ||||
| * | Update Dutch (Projectname variable not translated yet, because of undefined ↵ | jeroenpraat | 2015-05-18 | 2 | -383/+390 |
| | | | | | | | | variable) | ||||
* | | Merge branch 'master' into tres | redmatrix | 2015-05-17 | 4 | -23/+23 |
|\ \ | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-17 | 4 | -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 to | Razlo | 2015-05-17 | 4 | -23/+23 |
| | | | |||||
* | | | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 1 | -4/+3 |
|\| | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-14 | 1 | -4/+3 |
| |\| | |||||
| | * | Add sprintf.js v1.0.2. | Klaus Weidenbach | 2015-05-14 | 1 | -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\% again | jeroenpraat | 2015-05-12 | 2 | -56/+76 |
| | | | |||||
| | * | update pt-br transation | Alexandre Hannud Abdo | 2015-05-11 | 2 | -6099/+7075 |
| | | | |||||
* | | | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 56 | -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/redmatrix | redmatrix | 2015-05-10 | 9 | -74/+86 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: mod/mitem.php view/de/messages.po view/de/strings.php | ||||
| | * | provide drop down submenu suggestions in edit mode | Mario Vavti | 2015-05-10 | 1 | -0/+2 |
| | | | |||||
| | * | copy/paste typo | Mario Vavti | 2015-05-10 | 1 | -1/+1 |
| | | | |||||
| | * | provide ability to create submenus | Mario Vavti | 2015-05-10 | 6 | -8/+18 |
| | | | |||||
| | * | update to German strings | zottel | 2015-05-08 | 2 | -5226/+5453 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-07 | 5 | -227/+242 |
| |\| | |||||
| | * | provide wrap variable for comanche menus | Mario Vavti | 2015-05-07 | 1 | -1/+5 |
| | | | |||||
| | * | Update Dutch | jeroenpraat | 2015-05-07 | 2 | -221/+232 |
| | | | |||||
| | * | adjust icon size | Mario Vavti | 2015-05-07 | 2 | -5/+5 |
| | | | |||||
| * | | missed one... | redmatrix | 2015-05-06 | 1 | -1/+1 |
| | | | |||||
| * | | change notification colour | redmatrix | 2015-05-06 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-06 | 3 | -0/+28 |
| |\| | |||||
| | * | allow blocks to have custom classes and add a new template called zen which ↵ | Mario Vavti | 2015-05-06 | 1 | -0/+10 |
| | | | | | | | | | | | | gives you an empty page to work with | ||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-05 | 5 | -8101/+8002 |
| | |\ | |||||
| | * | | turn consensus items into diaspora polls for that network | redmatrix | 2015-05-05 | 2 | -0/+18 |
| | | | | |||||
| * | | | second pass name change | redmatrix | 2015-05-05 | 43 | -236/+236 |
| | | | | |||||
| * | | | first pass name change | redmatrix | 2015-05-05 | 22 | -363/+363 |
| | |/ | |/| | |||||
| * | | Merge pull request #317 from tuscanhobbit/dev | Paolo T | 2015-05-04 | 2 | -4048/+3998 |
| |\ \ | | | | | | | | | Italian translation | ||||
| | * | | Italian translation | Paolo Tacconi | 2015-05-04 | 2 | -4048/+3998 |
| | | | | |||||
| * | | | fix center page content setting | Mario Vavti | 2015-05-04 | 1 | -1/+2 |
| | | | | |||||
| * | | | Updating Dutch | jeroenpraat | 2015-05-02 | 2 | -4052/+4002 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' into tres | friendica | 2015-04-29 | 8 | -21/+102 |
|\| | | | | | | | | | | | | | | Conflicts: include/notifier.php | ||||
| * | | fix block view | Mario Vavti | 2015-04-29 | 1 | -1/+1 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | friendica | 2015-04-28 | 1 | -1/+0 |
| |\ \ | |||||
| | * | | revert some changes in justified gallery | Mario Vavti | 2015-04-28 | 1 | -1/+0 |
| | | | | |||||
| * | | | version update | friendica | 2015-04-28 | 1 | -1/+1 |
| |/ / | |||||
| * | | Provide webpage layout description | Mario Vavti | 2015-04-25 | 2 | -4/+12 |
| | | |