Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | 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 | |
| |\| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | 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 | |
| |\| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | 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 | |
| * | | | | | | | | | | | | | | | | 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 inj... | redmatrix | 2015-09-22 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | 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 | 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 lo... | redmatrix | 2015-09-21 | 1 | -0/+15 | |
| * | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-21 | 2 | -123/+129 | |
| |\| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | 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 | |
| |\| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | 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 | |
| |\| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | 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 | |
| |\| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | kick right aside out a little earlier | Mario Vavti | 2015-09-20 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-20 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | we need the xchan record also | redmatrix | 2015-09-20 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | Removed hot_deploy | Haakon Meland Eriksen | 2015-09-20 | 1 | -0/+0 | |
* | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-09-20 | 3 | -18/+66 | |
|\| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-20 | 2 | -1/+47 | |
| |\| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | initial checkin delivery report class | redmatrix | 2015-09-20 | 2 | -1/+47 | |
| * | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-19 | 2 | -1/+2 | |
| |\| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | clone new connection requests | redmatrix | 2015-09-19 | 2 | -19/+20 | |
| * | | | | | | | | | | | | | | | | clone new connections | redmatrix | 2015-09-19 | 1 | -17/+18 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-09-19 | 14 | -20/+122 | |
|\| | | | | | | | | | | | | | | |