Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | move string files to hmessages.po and hstrings.php for hubzilla to avoid ↵ | redmatrix | 2015-09-26 | 24 | -0/+123351 |
| | | | | endless merge conflicts. | ||||
* | private mail: some work on conversations view | Mario Vavti | 2015-09-25 | 4 | -76/+30 |
| | |||||
* | 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 | 8 | -20/+31 |
|\ | |||||
| * | some heavy private mail restructuring - work in progress | Mario Vavti | 2015-09-24 | 8 | -20/+31 |
| | | |||||
* | | 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 |
| | |||||
* | kick right aside out a little earlier | Mario Vavti | 2015-09-20 | 1 | -1/+1 |
| | |||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-18 | 4 | -10/+13 |
|\ | | | | | | | | | Conflicts: util/messages.po | ||||
| * | Another (hopefully final) Spanish update | jeroenpraat | 2015-09-17 | 2 | -5/+5 |
| | | |||||
| * | fix calculation of content height with margins | Mario Vavti | 2015-09-17 | 2 | -5/+8 |
| | | |||||
* | | css fixes | Mario Vavti | 2015-09-18 | 8 | -1/+8 |
| | | |||||
* | | change photo permissions when attach permissions are changed through ↵ | redmatrix | 2015-09-18 | 1 | -1/+1 |
| | | | | | | | | mod/filestorage, and fix lockview for photos. | ||||
* | | Converse width for a few related (old) schemas back to 1024px / Name default ↵ | jeroenpraat | 2015-09-17 | 6 | -6/+15 |
| | | | | | | | | theme to Focus / Non expert custom display settings above expert display settings, so people can better find them. | ||||
* | | 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 |
|/ / | |||||
* | | italian string correction | redmatrix | 2015-09-15 | 1 | -1/+1 |
| | | |||||
* | | make sure we've got a doc type | redmatrix | 2015-09-15 | 1 | -1/+1 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-14 | 2 | -194/+194 |
|\| | |||||
| * | Small update Spanish strings | jeroenpraat | 2015-09-14 | 2 | -194/+194 |
| | | |||||
| * | quick fix for choklet bannertwo | Mario Vavti | 2015-09-14 | 1 | -3/+5 |
| | | |||||
* | | Update siteinfo.tpl | jeroenpraat | 2015-09-14 | 1 | -0/+1 |
| | | |||||
* | | quick fix for choklet bannertwo | Mario Vavti | 2015-09-14 | 2 | -4/+6 |
| | | |||||
* | | mod_locs - put the primary into a (non-functioning) button for visual ↵ | redmatrix | 2015-09-13 | 1 | -1/+1 |
| | | | | | | | | consistency. | ||||
* | | fix banner for full flavour | Mario Vavti | 2015-09-13 | 1 | -4/+3 |
| | | |||||
* | | hopefully fix banner for choklet flavour | Mario Vavti | 2015-09-13 | 5 | -22/+17 |
| | | |||||
* | | an attempt to fix the banner mess | Mario Vavti | 2015-09-12 | 3 | -27/+18 |
| | | |||||
* | | center page content by default - css file | Mario Vavti | 2015-09-11 | 1 | -0/+8 |
| | | |||||
* | | center page content by default | Mario Vavti | 2015-09-11 | 6 | -23/+13 |
| | | |||||
* | | css fix | Mario Vavti | 2015-09-11 | 1 | -2/+1 |
| | | |||||
* | | 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 |
| | | |