aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* private mail: bring additional inbox/outbox views and ajaxify single message ...Mario Vavti2015-09-287-32/+39
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-271-4/+6
|\
| * well there's one problem...redmatrix2015-09-271-4/+4
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-275-2795/+2335
|\|
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-272-31/+31
| |\
| | * Another Spanish updatejeroenpraat2015-09-252-31/+31
| * | add some safety checks on the sending side of syncredmatrix2015-09-273-30/+44
| |/
* | move string files to hmessages.po and hstrings.php for hubzilla to avoid endl...redmatrix2015-09-2633-15/+134666
* | 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 content-...redmatrix2015-09-262-46/+64
| |/ / |/| |
* | | As a result of the logo vote: replaced favicon, remade alternative hubzilla a...jeroenpraat2015-09-2515-0/+0
|/ /
* | 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 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 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