Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | a clear is needed after floating | Mario Vavti | 2015-09-28 | 1 | -1/+1 |
| | |||||
* | private mail: bring additional inbox/outbox views and ajaxify single message ↵ | Mario Vavti | 2015-09-28 | 4 | -14/+5 |
| | | | | drop | ||||
* | private mail: some work on conversations view | Mario Vavti | 2015-09-25 | 2 | -16/+16 |
| | |||||
* | deliveries per process ui for setting | redmatrix | 2015-09-25 | 1 | -0/+1 |
| | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-09-24 | 4 | -18/+24 |
|\ | |||||
| * | some heavy private mail restructuring - work in progress | Mario Vavti | 2015-09-24 | 4 | -18/+24 |
| | | |||||
* | | Document the additional content export options | redmatrix | 2015-09-24 | 1 | -0/+7 |
|/ | |||||
* | delivery reports - crude but mostly functional at least for zot deliveries | redmatrix | 2015-09-22 | 1 | -0/+5 |
| | |||||
* | issue #51 | redmatrix | 2015-09-21 | 1 | -1/+1 |
| | |||||
* | looks like chat has been neglected a bit recently | redmatrix | 2015-09-20 | 3 | -3/+3 |
| | |||||
* | change photo permissions when attach permissions are changed through ↵ | redmatrix | 2015-09-18 | 1 | -1/+1 |
| | | | | mod/filestorage, and fix lockview for photos. | ||||
* | missing refernce to array | Mario Vavti | 2015-09-17 | 1 | -1/+1 |
| | |||||
* | quickfix for private messages - needs a lot more work | Mario Vavti | 2015-09-17 | 3 | -20/+29 |
| | |||||
* | Revert "moved submit button to the bottom in settings.tpl" | Mario Vavti | 2015-09-17 | 1 | -5/+7 |
| | | | | This reverts commit 1500691cc22443aac9bb6af409f8bbd64787a9e9. | ||||
* | Merge pull request #44 from mrjive/move_submit_button | redmatrix | 2015-09-17 | 1 | -7/+5 |
|\ | | | | | moved submit button to the bottom in settings.tpl | ||||
| * | moved submit button to the bottom in settings.tpl | mrjive | 2015-09-16 | 1 | -7/+5 |
| | | |||||
* | | added toggle_select | mrjive | 2015-09-16 | 1 | -5/+5 |
|/ | |||||
* | make sure we've got a doc type | redmatrix | 2015-09-15 | 1 | -1/+1 |
| | |||||
* | Update siteinfo.tpl | jeroenpraat | 2015-09-14 | 1 | -0/+1 |
| | |||||
* | mod_locs - put the primary into a (non-functioning) button for visual ↵ | redmatrix | 2015-09-13 | 1 | -1/+1 |
| | | | | consistency. | ||||
* | 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. | ||||
* | 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 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-02 | 2 | -2/+4 |
|\| | |||||
| * | sort out some app display weirdness | redmatrix | 2015-09-02 | 2 | -2/+4 |
| | | |||||
* | | provide consistent ui for things | redmatrix | 2015-09-01 | 4 | -2/+20 |
| | | |||||
* | | separate objs/things from taxonomy | redmatrix | 2015-09-01 | 1 | -4/+4 |
| | | |||||
* | | this is weird | redmatrix | 2015-08-25 | 2 | -4/+4 |
| | | |||||
* | | change name of module | redmatrix | 2015-08-22 | 2 | -4/+4 |
| | | |||||
* | | 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 | 2 | -3/+3 |
|\| | | | | | | | | | Conflicts: view/nl/messages.po | ||||
| * | commit 631eb4b broke the checkboxes in admin/site, so separate normal ↵ | redmatrix | 2015-08-17 | 2 | -3/+3 |
| | | | | | | | | checkboxes from bulk edit checkboxes in the css | ||||
* | | 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 |
| | | |||||
* | | 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 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 |
| | |