aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-265-79/+33
|\
| * Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-09-2515-0/+0
| |\
| * | private mail: some work on conversations viewMario Vavti2015-09-255-79/+33
| | |
* | | import_xchan_photo: check the return headers to ensure it's an image ↵redmatrix2015-09-262-46/+64
| |/ |/| | | | | content-type of some form as imagick chucks a wobbly if you try to initialise an image with an html error page.
* | As a result of the logo vote: replaced favicon, remade alternative hubzilla ↵jeroenpraat2015-09-2515-0/+0
|/ | | | avatar and uploaded 6 logo variants. Originals courtesy of Iko.
* 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, ↵redmatrix2015-09-241-2/+50
| | | | and translateable
* add Diaspora (actually any external service which uses the queue) to ↵redmatrix2015-09-241-0/+8
| | | | delivery reports
* 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 progress
| | * some heavy private mail restructuring - work in progressMario Vavti2015-09-2413-141/+285
| |/
* / Document the additional content export optionsredmatrix2015-09-244-4/+25
|/
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-232-2/+3
|\ | | | | | | | | Conflicts: install/update.php
| * 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 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