aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-232-2/+24
|\
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-220-0/+0
| |\
| | * problems with extended item import and signaturesredmatrix2015-09-221-3/+62
| * | merge issueredmatrix2015-09-221-4/+2
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-221-2/+4
| |\|
| | * don't send sync packets to deleted hubloc locationsredmatrix2015-09-221-2/+4
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-220-0/+0
| |\|
| | * inverted logic syncing deleted hublocsredmatrix2015-09-221-1/+1
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-221-1/+3
| |\|
| | * add names to delivery report for sync deliveryredmatrix2015-09-221-1/+3
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-221-1/+11
| |\|
| | * report the channel syncredmatrix2015-09-221-1/+11
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-222-0/+10
| |\|
| | * backport item syncredmatrix2015-09-222-2/+91
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-2213-6/+128
|\| |
| * | allow self delivery until we figure out why clone sync of posted items isn't ...redmatrix2015-09-221-5/+6
| * | add one more testredmatrix2015-09-221-1/+1
| * | fix foreach warningredmatrix2015-09-221-1/+1
| * | since this is now usable, protect the displayed delivery reports from XSS inj...redmatrix2015-09-221-1/+1
| * | delivery reports - crude but mostly functional at least for zot deliveriesredmatrix2015-09-224-4/+23
| * | Merge pull request #54 from git-marijus/masterredmatrix2015-09-221-0/+1
| |\ \
| | * | fix consensus items - issue #53Mario Vavti2015-09-221-0/+1
| * | | remove dummy update from mergeredmatrix2015-09-221-4/+0
| * | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-222-1/+5
| |\ \ \ | | | |/ | | |/|
| | * | dummy updateredmatrix2015-09-223-3/+7
| * | | heavy lifting for delivery reportsredmatrix2015-09-229-4/+105
| | |/ | |/|
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-227-146/+188
|\| |
| * | more progress on delivery reports. Store the remote results from zot sites lo...redmatrix2015-09-211-0/+15
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-212-123/+129
| |\|
| | * issue #52 - try all matching hublocs for remote auth, not just the "best one".redmatrix2015-09-212-129/+136
| * | issue #50 - cloud listings produce white screen for unauthenticated viewerredmatrix2015-09-211-18/+20
| * | issue #51redmatrix2015-09-213-5/+24
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-219-27/+63
|\| |
| * | looks like chat has been neglected a bit recentlyredmatrix2015-09-206-8/+7
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-202-13/+43
| |\|
| | * new delivery report formatredmatrix2015-09-202-13/+42
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-201-3/+1
| |\|
| | * improve on the last attemptredmatrix2015-09-201-4/+4
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-201-4/+13
| |\|
| | * catch the timestamp alsoredmatrix2015-09-201-1/+1
| | * remove system flags from channel import packetredmatrix2015-09-201-5/+9
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-201-1/+1
| |\ \
| | * | kick right aside out a little earlierMario Vavti2015-09-201-1/+1
| * | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-201-1/+1
| |\ \ \ | | |/ / | |/| / | | |/
| | * we need the xchan record alsoredmatrix2015-09-201-1/+1
* | | Removed hot_deployHaakon Meland Eriksen2015-09-201-0/+0
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-203-18/+66
|\| |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-202-1/+47
| |\|
| | * initial checkin delivery report classredmatrix2015-09-202-1/+47
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-192-1/+2
| |\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 10:36:54 +0000