| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | 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 | |
| | | | ||||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-20 | 1 | -1/+1 | |
| |\| | | | | | | | | | Conflicts: include/zot.php | |||||
| | * | we need the xchan record also | redmatrix | 2015-09-20 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-19 | 1 | -0/+1 | |
| |\| | | | | | | | | | Conflicts: include/zot.php | |||||
| | * | clone new connection requests | redmatrix | 2015-09-19 | 1 | -18/+19 | |
| | | | ||||||
| * | | clone new connections | redmatrix | 2015-09-19 | 1 | -17/+18 | |
| | | | ||||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-18 | 1 | -1/+1 | |
| |\| | ||||||
| | * | include site identitfier on redmatrix delivery reports also | redmatrix | 2015-09-18 | 1 | -0/+2 | |
| | | | ||||||
| * | | add reporting site to delivery report | redmatrix | 2015-09-18 | 1 | -0/+2 | |
| | | | ||||||
| * | | more work on surviving hub re-installs | redmatrix | 2015-09-18 | 1 | -2/+6 | |
| | | | ||||||
| * | | consolidate zotfinger and webfinger | redmatrix | 2015-09-17 | 1 | -0/+288 | |
| | | | ||||||
| * | | Merge pull request #38 from MicMee/master | redmatrix | 2015-09-12 | 1 | -3/+3 | |
| |\ \ | | | | | | | ensure that living sites are marked as alive | |||||
| | * | | ensure that living sites are marked as alive | Michael Meer | 2015-09-11 | 1 | -3/+3 | |
| | | | | ||||||
| * | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-11 | 1 | -1/+4 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | log the remote message if there was one | redmatrix | 2015-09-11 | 1 | -1/+4 | |
| | | | | ||||||
| * | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-11 | 1 | -18/+34 | |
| |\| | | |/ |/| | | | | | Conflicts: util/messages.po | |||||
| | * | another tactic to deal with orphan hublocs from re-installs, or at least ↵ | redmatrix | 2015-09-11 | 1 | -18/+34 | |
| | | | | | | | | | allow the descendant channel to survive | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |