Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-20 | 2 | -105/+105 |
|\ | |||||
| * | Another Spanish strings update | jeroenpraat | 2015-08-20 | 2 | -105/+105 |
| | | |||||
* | | some event related fixes and some base work for implementing native tasks ↵ | redmatrix | 2015-08-20 | 1 | -8/+1 |
| | | | | | | | | (to-do lists); which should already be importable and exportable. | ||||
* | | issues encountered whilst testing import_items module using yearly dump files | redmatrix | 2015-08-17 | 1 | -1/+1 |
| | | |||||
* | | provide module for importing yearly content dumps | redmatrix | 2015-08-17 | 1 | -0/+15 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-17 | 5 | -301/+301 |
|\| | | | | | | | | | Conflicts: view/nl/messages.po | ||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-17 | 3 | -329/+329 |
| |\ | |||||
| | * | Replaced Dutch po file by Spanish po file by accident. Had no visible impact. | jeroenpraat | 2015-08-17 | 1 | -2075/+2071 |
| | | | |||||
| | * | Final Spanish strings for now | jeroenpraat | 2015-08-17 | 2 | -297/+297 |
| | | | |||||
| | * | Fixed Spanish strings | jeroenpraat | 2015-08-17 | 1 | -2103/+2107 |
| | | | |||||
| * | | commit 631eb4b broke the checkboxes in admin/site, so separate normal ↵ | redmatrix | 2015-08-17 | 3 | -4/+4 |
| |/ | | | | | | | checkboxes from bulk edit checkboxes in the css | ||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-16 | 2 | -3/+8 |
|\| | |||||
| * | issue #386 - account and channel bulk edit checkboxes not visible and ↵ | redmatrix | 2015-08-16 | 2 | -3/+8 |
| | | | | | | | | therefore not useable. Also change wording to remove the offensive 'user' designation. | ||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-14 | 2 | -17/+17 |
|\| | | | | | | | | | | | Conflicts: include/zot.php util/messages.po | ||||
| * | update spanish | jeroenpraat | 2015-08-14 | 2 | -17/+17 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-12 | 11 | -11288/+19620 |
|\| | | | | | | | | | | | Conflicts: view/es/htconfig.tpl view/es/update_fail_eml.tpl | ||||
| * | Some corrections of Spanish strings. | jeroenpraat | 2015-08-12 | 2 | -135/+136 |
| | | |||||
| * | And Catalan! | jeroenpraat | 2015-08-12 | 2 | -6006/+9675 |
| | | |||||
| * | Thanks to Manuel. Updated Spanish to 100 procent. | jeroenpraat | 2015-08-12 | 9 | -5281/+9942 |
| | | |||||
| * | Update Dutch strings | jeroenpraat | 2015-08-09 | 2 | -12/+17 |
| | | |||||
| * | Update Dutch strings | jeroenpraat | 2015-08-05 | 2 | -1465/+1379 |
| | | |||||
| * | Merge pull request #382 from tuscanhobbit/master | Paolo T | 2015-08-03 | 2 | -1354/+1266 |
| |\ | | | | | | | Italian translation | ||||
| | * | Italian translation | Paolo Tacconi | 2015-08-03 | 2 | -1354/+1266 |
| | | | |||||
* | | | forum widget | redmatrix | 2015-08-11 | 1 | -0/+1 |
| | | | |||||
* | | | more work separating Diaspora from core | redmatrix | 2015-08-03 | 2 | -24/+0 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-31 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | Conflicts: util/messages.po | ||||
| * | | consistency of event form | redmatrix | 2015-07-31 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-27 | 1 | -6/+5 |
|\| | | |||||
| * | | align buttons on event calendar | redmatrix | 2015-07-27 | 1 | -6/+5 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-27 | 1 | -0/+13 |
|\| | | | | | | | | | | | | | | Conflicts: util/messages.po | ||||
| * | | crude but more or less functional event import from thunderbird ics files | redmatrix | 2015-07-26 | 1 | -0/+13 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-26 | 1 | -0/+9 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: mod/connedit.php view/pt-br/messages.po view/pt-br/strings.php | ||||
| * | | Provide connection status if status is "a-normal" | Mario Vavti | 2015-07-26 | 1 | -0/+9 |
| | | | |||||
| * | | update pt-br strings | Alexandre Hannud Abdo | 2015-07-24 | 2 | -3156/+3297 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-21 | 2 | -3/+8 |
|\| | | | | | | | | | | | | | | Conflicts: doc/to_do_code.bb | ||||
| * | | Fixes regarding the new default profile photo size. The default profile ↵ | Mario Vavti | 2015-07-20 | 1 | -1/+1 |
| | | | | | | | | | | | | photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format. | ||||
| * | | show icons instead of disabled checkboxes | Mario Vavti | 2015-07-20 | 1 | -2/+7 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-19 | 1 | -45/+32 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/identity.php include/widgets.php util/messages.po view/it/messages.po view/it/strings.php | ||||
| * | | fix missing div and a regression introduced in ↵ | Mario Vavti | 2015-07-16 | 1 | -45/+32 |
| | | | | | | | | | | | | ec23a94b6d7f6db1e1d34275b8143cbc947db802 which broke tag removal for photos | ||||
| * | | Merge pull request #376 from tuscanhobbit/master | Paolo T | 2015-07-16 | 2 | -305/+369 |
| |\| | | | | | | | Updated Italian strings | ||||
| | * | Updated Italian strings | Paolo Tacconi | 2015-07-16 | 2 | -305/+369 |
| | | | |||||
* | | | the view_photos and post_photos permissions are redundant and are now mapped ↵ | redmatrix | 2015-07-19 | 2 | -9/+0 |
| | | | | | | | | | | | | to view_storage and write_storage | ||||
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-15 | 2 | -5/+8 |
|\| | | |||||
| * | | show inherited state in Connection Default Permissions | Mario Vavti | 2015-07-15 | 2 | -5/+8 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-14 | 7 | -437/+268 |
|\| | | | | | | | | | | | | | | Conflicts: mod/connedit.php | ||||
| * | | make strings translateable | Mario Vavti | 2015-07-14 | 1 | -6/+6 |
| | | | |||||
| * | | disable the inherited checkboxes for notself | Mario Vavti | 2015-07-14 | 1 | -1/+1 |
| | | | |||||
| * | | fix mod_connedit.js after cleanup | Mario Vavti | 2015-07-14 | 2 | -1/+35 |
| | | | |||||
| * | | revert this until further investigation | Mario Vavti | 2015-07-14 | 1 | -1/+1 |
| | | | |||||
| * | | css fixes | Mario Vavti | 2015-07-14 | 1 | -5/+1 |
| | | |