Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #80 from git-marijus/master | redmatrix | 2015-10-14 | 1 | -2/+2 |
|\ | | | | | fix /channel not updating after posting comment | ||||
| * | fix photo visibility switch on photo upload | Mario Vavti | 2015-10-13 | 1 | -2/+2 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-13 | 1 | -3/+4 |
|\ \ | | | | | | | | | | | | | Conflicts: include/api.php | ||||
| * | | api extenesions for file migration | redmatrix | 2015-10-13 | 1 | -4/+5 |
| | | | |||||
* | | | file migration - continued | redmatrix | 2015-10-13 | 1 | -4/+29 |
| |/ |/| | |||||
* | | port of file detail api call | redmatrix | 2015-10-12 | 1 | -3/+1 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-12 | 1 | -0/+24 |
|\| | |||||
| * | file detail api call (will not work for huge files) | redmatrix | 2015-10-12 | 1 | -0/+24 |
| | | |||||
* | | missing underscore | redmatrix | 2015-10-12 | 1 | -1/+1 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-12 | 2 | -2/+10 |
|\| | | | | | | | | | Conflicts: include/attach.php | ||||
| * | attach_list_files had some problems - wasn't used until now apparently | redmatrix | 2015-10-12 | 2 | -2/+10 |
| | | |||||
* | | small change to allow a person with sufficient privileges the ability to ↵ | redmatrix | 2015-10-12 | 1 | -3/+12 |
| | | | | | | | | import a file into their cloud storage from elsewhere in the server filesystem - without nuking it in the process. | ||||
* | | functions to update urls in items when doing migrations | redmatrix | 2015-10-06 | 1 | -0/+44 |
| | | |||||
* | | remove check mail - it just reloads the page. we get a notification in the ↵ | Mario Vavti | 2015-10-04 | 1 | -6/+0 |
| | | | | | | | | panel if we get new mail | ||||
* | | Red:Notify > Hubzilla:Notify | jeroenpraat | 2015-10-03 | 1 | -9/+9 |
| | | |||||
* | | need full path to deliver_hooks.php | redmatrix | 2015-10-02 | 1 | -1/+1 |
| | | |||||
* | | one more change | redmatrix | 2015-10-01 | 2 | -0/+3 |
| | | |||||
* | | notification changes to support testdrive | redmatrix | 2015-10-01 | 2 | -1/+5 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-01 | 2 | -5/+5 |
|\| | |||||
| * | allow additional uses for xtags | redmatrix | 2015-10-01 | 2 | -5/+5 |
| | | |||||
* | | issue #63 - missing table fields in db query | redmatrix | 2015-09-30 | 1 | -2/+2 |
| | | |||||
* | | add delivery reports to mail (not backported to redmatrix) | redmatrix | 2015-09-30 | 1 | -7/+15 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-30 | 1 | -3/+14 |
|\| | | | | | | | | | | | | | Conflicts: include/zot.php view/de/messages.po view/de/strings.php | ||||
| * | document the issue with cloned delivery to self vs normal delivery to self | redmatrix | 2015-09-30 | 1 | -2/+13 |
| | | |||||
| * | undo self-deliver check | redmatrix | 2015-09-30 | 1 | -5/+6 |
| | | |||||
* | | undo self deliver check | redmatrix | 2015-09-30 | 1 | -5/+6 |
| | | |||||
* | | another error from the db logs | redmatrix | 2015-09-29 | 1 | -1/+1 |
| | | |||||
* | | wrong table column names | redmatrix | 2015-09-29 | 2 | -2/+2 |
| | | |||||
* | | queue cleanup, and report issues | redmatrix | 2015-09-29 | 2 | -5/+32 |
| | | |||||
* | | more work on the notifier | redmatrix | 2015-09-29 | 1 | -1/+6 |
| | | |||||
* | | improve the sys channel location repair to check key issues and re-installs ↵ | redmatrix | 2015-09-29 | 1 | -2/+10 |
| | | | | | | | | and/or site moves | ||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-09-29 | 1 | -0/+6 |
|\ \ | |||||
| * | | fix typo in 0b1cd826b05b6ec9637e373735967a2555eeb1d4 | Mario Vavti | 2015-09-29 | 1 | -1/+1 |
| | | | |||||
| * | | do not store a recalled mail if we can not find the original mid | Mario Vavti | 2015-09-29 | 1 | -0/+6 |
| | | | |||||
* | | | check and repair sys channel locations (hublocs) in zot-finger if they are ↵ | redmatrix | 2015-09-29 | 1 | -0/+61 |
|/ / | | | | | | | messed up | ||||
* | | add one more level of parentheses to ensure operator precedence is correctly ↵ | redmatrix | 2015-09-28 | 1 | -2/+2 |
| | | | | | | | | evaluated | ||||
* | | check public scopes against visitor in item_permissions_sql() | redmatrix | 2015-09-28 | 1 | -2/+38 |
| | | |||||
* | | resolve conflicts | redmatrix | 2015-09-28 | 1 | -7/+0 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-28 | 1 | -0/+6 |
|\| | |||||
| * | process_delivery: ignore self | redmatrix | 2015-09-28 | 1 | -0/+6 |
| | | |||||
* | | ignore self delivery in process_delivery | redmatrix | 2015-09-28 | 1 | -7/+5 |
| | | |||||
* | | Merge branch 'deadsite' | redmatrix | 2015-09-28 | 7 | -14/+56 |
|\ \ | |||||
| * | | typo | redmatrix | 2015-09-28 | 1 | -2/+2 |
| | | | |||||
| * | | create site records for all queued sites and check for death | redmatrix | 2015-09-28 | 4 | -9/+47 |
| | | | |||||
| * | | add site_type to queries, first few - several more to go. | redmatrix | 2015-09-28 | 3 | -5/+9 |
| | | | |||||
* | | | private mail: bring additional inbox/outbox views and ajaxify single message ↵ | Mario Vavti | 2015-09-28 | 1 | -1/+3 |
|/ / | | | | | | | drop | ||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-27 | 1 | -4/+6 |
|\| | | | | | | | | | Conflicts: include/zot.php | ||||
| * | well there's one problem... | redmatrix | 2015-09-27 | 1 | -4/+4 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-27 | 1 | -5/+13 |
|\| | | | | | | | | | | | Conflicts: include/zot.php util/messages.po | ||||
| * | add some safety checks on the sending side of sync | redmatrix | 2015-09-27 | 1 | -6/+20 |
| | |