| 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 |
| | | | |||||
| * | | 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 |
| | | | |||||
| | * | problems with extended item import and signatures | redmatrix | 2015-09-22 | 1 | -3/+62 |
| | | | |||||
| * | | move string files to hmessages.po and hstrings.php for hubzilla to avoid ↵ | redmatrix | 2015-09-26 | 2 | -5/+15 |
| | | | | | | | | | endless merge conflicts. | ||||
| * | | import_xchan_photo: check the return headers to ensure it's an image ↵ | redmatrix | 2015-09-26 | 2 | -46/+64 |
| | | | | | | | | | content-type of some form as imagick chucks a wobbly if you try to initialise an image with an html error page. | ||||
| * | | remove redundant code | redmatrix | 2015-09-24 | 1 | -7/+1 |
| | | | |||||
| * | | delivery optimisations | redmatrix | 2015-09-24 | 2 | -8/+54 |
| | | | |||||
| * | | add Diaspora (actually any external service which uses the queue) to ↵ | redmatrix | 2015-09-24 | 1 | -0/+8 |
| | | | | | | | | | delivery reports | ||||
| * | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-09-24 | 3 | -19/+120 |
| |\ \ | |||||
| | * | | some heavy private mail restructuring - work in progress | Mario Vavti | 2015-09-24 | 3 | -19/+120 |
| | | | | |||||
| * | | | Document the additional content export options | redmatrix | 2015-09-24 | 1 | -1/+4 |
| |/ / | |||||
| * | | timezone tweaks | redmatrix | 2015-09-23 | 1 | -6/+10 |
| | | | |||||
| * | | add plugin hooks to channel sync/import/export | redmatrix | 2015-09-23 | 2 | -0/+6 |
| | | | |||||
| * | | 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 | 2 | -0/+10 |
| |\| | | | | | | | | | | | Conflicts: include/items.php include/zot.php | ||||
| | * | backport item sync | redmatrix | 2015-09-22 | 2 | -2/+91 |
| | | | |||||
| * | | 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 | 2 | -3/+6 |
| | | | |||||
| * | | heavy lifting for delivery reports | redmatrix | 2015-09-22 | 4 | -2/+56 |
| | | | |||||
| * | | more progress on delivery reports. Store the remote results from zot sites ↵ | redmatrix | 2015-09-21 | 1 | -0/+15 |
| | | | | | | | | | locally. | ||||
| * | | issue #51 | redmatrix | 2015-09-21 | 1 | -0/+12 |
| | | | |||||
| * | | looks like chat has been neglected a bit recently | redmatrix | 2015-09-20 | 2 | -4/+3 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-20 | 2 | -13/+43 |
| |\| | | | | | | | | | Conflicts: include/zot.php | ||||
| | * | new delivery report format | redmatrix | 2015-09-20 | 2 | -13/+42 |
| | | | |||||
| * | | 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 | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |