Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-09-10 | 10 | -108/+52 |
|\ | |||||
| * | fix radius setting | Mario Vavti | 2015-09-10 | 1 | -1/+1 |
| | | |||||
| * | make redmatrix focus scheme default for hubzilla | Mario Vavti | 2015-09-10 | 10 | -108/+52 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-10 | 2 | -463/+463 |
|\ \ | |/ |/| | | | | | Conflicts: include/zot.php | ||||
| * | update Spanish strings | jeroenpraat | 2015-09-10 | 2 | -463/+463 |
| | | |||||
| * | Merge pull request #391 from tuscanhobbit/master | Wave | 2015-09-07 | 2 | -376/+387 |
| |\ | | | | | | | Updated Italian strings | ||||
| | * | Updated Italian strings | Paolo Tacconi | 2015-09-07 | 2 | -376/+387 |
| | | | |||||
* | | | don't auto-open the editor in forum mode. Save the forum selection text ↵ | redmatrix | 2015-09-09 | 1 | -0/+3 |
| | | | | | | | | | | | | until we open it. | ||||
* | | | move mod_admin to Comanche finally | redmatrix | 2015-09-08 | 1 | -0/+3 |
| | | | |||||
* | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-07 | 1 | -6/+9 |
|\| | | | | | | | | | | | | | | Conflicts: util/messages.po | ||||
| * | | uexport template fixes | Mario Vavti | 2015-09-04 | 1 | -6/+9 |
| | | | |||||
* | | | Always open rpost editor on document ready | redmatrix | 2015-09-06 | 1 | -0/+1 |
| | | | |||||
* | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-02 | 3 | -3/+15 |
|\| | | |||||
| * | | more adjustment to apps containers | redmatrix | 2015-09-02 | 1 | -2/+3 |
| | | | |||||
| * | | sort out some app display weirdness | redmatrix | 2015-09-02 | 3 | -3/+14 |
| | | | |||||
| * | | increase height of app-container so edit controls aren't shadowed | redmatrix | 2015-09-02 | 1 | -1/+1 |
| | | | |||||
* | | | provide consistent ui for things | redmatrix | 2015-09-01 | 4 | -2/+20 |
| | | | |||||
* | | | separate objs/things from taxonomy | redmatrix | 2015-09-01 | 1 | -4/+4 |
| | | | |||||
* | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-31 | 3 | -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) + ↵ | jeroenpraat | 2015-08-29 | 2 | -55/+55 |
| | | | | | | | | | | | | update strings ES | ||||
| * | | Update es and nl strings | jeroenpraat | 2015-08-28 | 4 | -245/+257 |
| | | | |||||
* | | | more work on doco search | redmatrix | 2015-08-30 | 2 | -0/+11 |
| | | | |||||
* | | | this is weird | redmatrix | 2015-08-25 | 3 | -5/+5 |
| | | | |||||
* | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-23 | 2 | -743/+743 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: include/zot.php install/update.php util/messages.po | ||||
| * | | Final (temporary I suppose) Spanish string update | jeroenpraat | 2015-08-22 | 2 | -743/+743 |
| | | | |||||
* | | | change name of module | redmatrix | 2015-08-22 | 3 | -5/+5 |
| | | | |||||
* | | | increase width of tasklist input element | redmatrix | 2015-08-22 | 1 | -1/+5 |
| | | | |||||
* | | | limit the height of tasklist | redmatrix | 2015-08-20 | 1 | -0/+8 |
| | | | |||||
* | | | put tasklist into events page comanche layout | redmatrix | 2015-08-20 | 1 | -0/+3 |
| | | | |||||
* | | | 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 |
| | | |