aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'zottel2015-09-2515-0/+0
|\
| * As a result of the logo vote: replaced favicon, remade alternative hubzilla a...jeroenpraat2015-09-2515-0/+0
* | Merge remote-tracking branch 'upstream/master'zottel2015-09-2523-160/+425
|\|
| * deliveries per process ui for settingredmatrix2015-09-252-0/+4
| * remove redundant coderedmatrix2015-09-241-7/+1
| * delivery optimisationsredmatrix2015-09-242-8/+54
| * clean up the delivery reports to make them manageable, more approachable, and...redmatrix2015-09-241-2/+50
| * add Diaspora (actually any external service which uses the queue) to delivery...redmatrix2015-09-241-0/+8
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-2413-141/+285
| |\
| | * Merge pull request #55 from git-marijus/masterredmatrix2015-09-2513-141/+285
| | |\
| | | * some heavy private mail restructuring - work in progressMario Vavti2015-09-2413-141/+285
| | |/
| * / Document the additional content export optionsredmatrix2015-09-244-4/+25
| |/
* | Merge remote-tracking branch 'upstream/master'zottel2015-09-249-9/+33
|\|
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-232-2/+3
| |\
| | * dummy updateredmatrix2015-09-233-3/+7
| * | add vdata field for caldavredmatrix2015-09-234-2/+13
| * | timezone tweaksredmatrix2015-09-231-6/+10
| * | add plugin hooks to channel sync/import/exportredmatrix2015-09-233-0/+8
* | | Merge remote-tracking branch 'upstream/master'zottel2015-09-2326-194/+464
|\| |
| * | 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
| * | 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
| | |/ | |/|
| * | 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
| * | 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
| |\|
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-02 21:42:20 +0000