| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-09-24 | 22 | -150/+318 |
| |\ | |||||
| | * | Merge pull request #55 from git-marijus/master | redmatrix | 2015-09-25 | 13 | -141/+285 |
| | |\ | | | | | | | some heavy private mail restructuring - work in progress | ||||
| | | * | some heavy private mail restructuring - work in progress | Mario Vavti | 2015-09-24 | 13 | -141/+285 |
| | |/ | |||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-23 | 2 | -2/+3 |
| | |\ | | | | | | | | | | | | | Conflicts: install/update.php | ||||
| | | * | dummy update | redmatrix | 2015-09-23 | 3 | -3/+7 |
| | | | | |||||
| | * | | add vdata field for caldav | redmatrix | 2015-09-23 | 4 | -2/+13 |
| | | | | |||||
| | * | | timezone tweaks | redmatrix | 2015-09-23 | 1 | -6/+10 |
| | | | | |||||
| | * | | add plugin hooks to channel sync/import/export | redmatrix | 2015-09-23 | 3 | -0/+8 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-09-23 | 2 | -2/+24 |
| |\| | | |||||
| | * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-22 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | Conflicts: include/items.php | ||||
| | | * | problems with extended item import and signatures | redmatrix | 2015-09-22 | 1 | -3/+62 |
| | | | | |||||
| | * | | 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 |
| | | | | |||||
| | * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-22 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | Conflicts: include/zot.php | ||||
| | | * | 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 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-09-22 | 13 | -6/+128 |
| |\| | | |||||
| | * | | 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 |
| | | | | |||||
| | * | | since this is now usable, protect the displayed delivery reports from XSS ↵ | redmatrix | 2015-09-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | injection | ||||
| | * | | delivery reports - crude but mostly functional at least for zot deliveries | redmatrix | 2015-09-22 | 4 | -4/+23 |
| | | | | |||||
| | * | | Merge pull request #54 from git-marijus/master | redmatrix | 2015-09-22 | 1 | -0/+1 |
| | |\ \ | | | | | | | | | fix consensus items - issue #53 | ||||
| | | * | | fix consensus items - issue #53 | Mario Vavti | 2015-09-22 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | remove dummy update from merge | redmatrix | 2015-09-22 | 1 | -4/+0 |
| | | | | | |||||
| | * | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-22 | 2 | -1/+5 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | | * | | dummy update | redmatrix | 2015-09-22 | 3 | -3/+7 |
| | | | | | |||||
| | * | | | heavy lifting for delivery reports | redmatrix | 2015-09-22 | 9 | -4/+105 |
| | | |/ | |/| | |||||
| * | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-09-22 | 7 | -146/+188 |
| |\| | | |||||
| | * | | 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-21 | 2 | -123/+129 |
| | |\| | | | | | | | | | | | | | Conflicts: mod/post.php | ||||
| | | * | issue #52 - try all matching hublocs for remote auth, not just the "best one". | redmatrix | 2015-09-21 | 2 | -129/+136 |
| | | | | |||||
| | * | | issue #50 - cloud listings produce white screen for unauthenticated viewer | redmatrix | 2015-09-21 | 1 | -18/+20 |
| | | | | |||||
| | * | | issue #51 | redmatrix | 2015-09-21 | 3 | -5/+24 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-09-21 | 9 | -27/+63 |
| |\| | | |||||
| | * | | looks like chat has been neglected a bit recently | redmatrix | 2015-09-20 | 6 | -8/+7 |
| | | | | |||||
| | * | | 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/hubzilla into pending_merge | redmatrix | 2015-09-20 | 1 | -1/+1 |
| | |\ \ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |