aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* timezone tweaksredmatrix2015-09-231-6/+10
|
* add plugin hooks to channel sync/import/exportredmatrix2015-09-233-0/+8
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-220-0/+0
|\ | | | | | | | | Conflicts: include/items.php
| * 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
|\| | | | | | | | | Conflicts: include/zot.php
| * 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
|\| | | | | | | | | | | Conflicts: include/items.php include/zot.php
| * backport item syncredmatrix2015-09-222-2/+91
| |
* | allow self delivery until we figure out why clone sync of posted items isn't ↵redmatrix2015-09-221-5/+6
| | | | | | | | doing it's thing
* | 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 ↵redmatrix2015-09-221-1/+1
| | | | | | | | injection
* | 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 #53
| * | 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
| |/ |/|
* | more progress on delivery reports. Store the remote results from zot sites ↵redmatrix2015-09-211-0/+15
| | | | | | | | locally.
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-212-123/+129
|\| | | | | | | | | Conflicts: mod/post.php
| * 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
| |
* | 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
|\| | | | | | | | | Conflicts: include/zot.php
| * new delivery report formatredmatrix2015-09-202-13/+42
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-201-3/+1
|\| | | | | | | | | Conflicts: include/zot.php
| * improve on the last attemptredmatrix2015-09-201-4/+4
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-201-4/+13
|\| | | | | | | | | Conflicts: include/zot.php
| * 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
|\ \ \ | |/ / |/| / | |/ | | Conflicts: include/zot.php
| * we need the xchan record alsoredmatrix2015-09-201-1/+1
| |
* | 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
|\| | | | | | | | | Conflicts: include/zot.php
| * clone new connection requestsredmatrix2015-09-192-19/+20
| |
* | clone new connectionsredmatrix2015-09-191-17/+18
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-181-1/+1
|\|
| * include site identitfier on redmatrix delivery reports alsoredmatrix2015-09-181-0/+2
| |