Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-19 | 1 | -4/+11 |
|\ | | | | | | | | | | | | | | | | | Conflicts: include/zot.php install/schema_mysql.sql install/schema_postgres.sql install/update.php mod/zfinger.php | ||||
| * | add the project name to site info packet | redmatrix | 2015-10-19 | 1 | -4/+8 |
| | | |||||
* | | separate permission_update notification into permission_create and ↵ | redmatrix | 2015-10-18 | 1 | -1/+1 |
| | | | | | | | | permission_update, since some networks send out a notification for duplicate share requests even if connected. | ||||
* | | filter delivery reports | redmatrix | 2015-10-17 | 1 | -1/+43 |
| | | |||||
* | | more work on import & sync of private mail and conversations | redmatrix | 2015-10-14 | 1 | -0/+6 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-01 | 1 | -4/+4 |
|\| | |||||
| * | allow additional uses for xtags | redmatrix | 2015-10-01 | 1 | -4/+4 |
| | | |||||
* | | 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 |
| | | |||||
* | | improve the sys channel location repair to check key issues and re-installs ↵ | redmatrix | 2015-09-29 | 1 | -2/+10 |
| | | | | | | | | and/or site moves | ||||
* | | check and repair sys channel locations (hublocs) in zot-finger if they are ↵ | redmatrix | 2015-09-29 | 1 | -0/+61 |
| | | | | | | | | messed up | ||||
* | | 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 |
| | | |||||
* | | create site records for all queued sites and check for death | redmatrix | 2015-09-28 | 1 | -3/+5 |
| | | |||||
* | | 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 |
| | | |||||
* | | import_xchan_photo: check the return headers to ensure it's an image ↵ | redmatrix | 2015-09-26 | 1 | -1/+1 |
| | | | | | | | | content-type of some form as imagick chucks a wobbly if you try to initialise an image with an html error page. | ||||
* | | add plugin hooks to channel sync/import/export | redmatrix | 2015-09-23 | 1 | -0/+2 |
| | | |||||
* | | merge issue | redmatrix | 2015-09-22 | 1 | -4/+2 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-22 | 1 | -2/+4 |
|\| | |||||
| * | don't send sync packets to deleted hubloc locations | redmatrix | 2015-09-22 | 1 | -2/+4 |
| | | |||||
| * | inverted logic syncing deleted hublocs | redmatrix | 2015-09-22 | 1 | -1/+1 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-22 | 1 | -1/+3 |
|\| | |||||
| * | add names to delivery report for sync delivery | redmatrix | 2015-09-22 | 1 | -1/+3 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-22 | 1 | -1/+11 |
|\| | |||||
| * | report the channel sync | redmatrix | 2015-09-22 | 1 | -1/+11 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-22 | 1 | -0/+9 |
|\| | | | | | | | | | | | Conflicts: include/items.php include/zot.php | ||||
| * | backport item sync | redmatrix | 2015-09-22 | 1 | -0/+85 |
| | | |||||
* | | allow self delivery until we figure out why clone sync of posted items isn't ↵ | redmatrix | 2015-09-22 | 1 | -5/+6 |
| | | | | | | | | doing it's thing | ||||
* | | add one more test | redmatrix | 2015-09-22 | 1 | -1/+1 |
| | | |||||
* | | fix foreach warning | redmatrix | 2015-09-22 | 1 | -1/+1 |
| | | |||||
* | | delivery reports - crude but mostly functional at least for zot deliveries | redmatrix | 2015-09-22 | 1 | -3/+4 |
| | | |||||
* | | heavy lifting for delivery reports | redmatrix | 2015-09-22 | 1 | -1/+11 |
| | | |||||
* | | more progress on delivery reports. Store the remote results from zot sites ↵ | redmatrix | 2015-09-21 | 1 | -0/+15 |
| | | | | | | | | locally. | ||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-20 | 1 | -13/+34 |
|\| | | | | | | | | | Conflicts: include/zot.php | ||||
| * | new delivery report format | redmatrix | 2015-09-20 | 1 | -13/+33 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-20 | 1 | -3/+1 |
|\| | | | | | | | | | Conflicts: include/zot.php | ||||
| * | improve on the last attempt | redmatrix | 2015-09-20 | 1 | -4/+4 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-20 | 1 | -4/+13 |
|\| | | | | | | | | | Conflicts: include/zot.php | ||||
| * | catch the timestamp also | redmatrix | 2015-09-20 | 1 | -1/+1 |
| | | |||||
| * | remove system flags from channel import packet | redmatrix | 2015-09-20 | 1 | -5/+9 |
| | |