| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-27 | 5 | -2795/+2335 |
|\ |
|
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-27 | 2 | -31/+31 |
| |\ |
|
| | * | Another Spanish update | jeroenpraat | 2015-09-25 | 2 | -31/+31 |
| * | | add some safety checks on the sending side of sync | redmatrix | 2015-09-27 | 3 | -30/+44 |
| |/ |
|
* | | move string files to hmessages.po and hstrings.php for hubzilla to avoid endl... | redmatrix | 2015-09-26 | 33 | -15/+134666 |
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-09-26 | 5 | -79/+33 |
|\ \ |
|
| * \ | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-09-25 | 15 | -0/+0 |
| |\ \ |
|
| * | | | private mail: some work on conversations view | Mario Vavti | 2015-09-25 | 5 | -79/+33 |
* | | | | import_xchan_photo: check the return headers to ensure it's an image content-... | redmatrix | 2015-09-26 | 2 | -46/+64 |
| |/ /
|/| | |
|
* | | | As a result of the logo vote: replaced favicon, remade alternative hubzilla a... | jeroenpraat | 2015-09-25 | 15 | -0/+0 |
|/ / |
|
* | | deliveries per process ui for setting | redmatrix | 2015-09-25 | 2 | -0/+4 |
* | | remove redundant code | redmatrix | 2015-09-24 | 1 | -7/+1 |
* | | delivery optimisations | redmatrix | 2015-09-24 | 2 | -8/+54 |
* | | clean up the delivery reports to make them manageable, more approachable, and... | redmatrix | 2015-09-24 | 1 | -2/+50 |
* | | add Diaspora (actually any external service which uses the queue) to delivery... | redmatrix | 2015-09-24 | 1 | -0/+8 |
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-09-24 | 13 | -141/+285 |
|\ \ |
|
| * \ | Merge pull request #55 from git-marijus/master | redmatrix | 2015-09-25 | 13 | -141/+285 |
| |\ \ |
|
| | * | | some heavy private mail restructuring - work in progress | Mario Vavti | 2015-09-24 | 13 | -141/+285 |
| |/ / |
|
* / / | Document the additional content export options | redmatrix | 2015-09-24 | 4 | -4/+25 |
|/ / |
|
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-23 | 2 | -2/+3 |
|\| |
|
| * | dummy update | redmatrix | 2015-09-23 | 3 | -3/+7 |
* | | add vdata field for caldav | redmatrix | 2015-09-23 | 4 | -2/+13 |
* | | timezone tweaks | redmatrix | 2015-09-23 | 1 | -6/+10 |
* | | add plugin hooks to channel sync/import/export | redmatrix | 2015-09-23 | 3 | -0/+8 |
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-22 | 0 | -0/+0 |
|\| |
|
| * | problems with extended item import and signatures | redmatrix | 2015-09-22 | 1 | -3/+62 |
* | | merge issue | redmatrix | 2015-09-22 | 1 | -4/+2 |
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-22 | 1 | -2/+4 |
|\| |
|
| * | don't send sync packets to deleted hubloc locations | redmatrix | 2015-09-22 | 1 | -2/+4 |
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-22 | 0 | -0/+0 |
|\| |
|
| * | inverted logic syncing deleted hublocs | redmatrix | 2015-09-22 | 1 | -1/+1 |
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-22 | 1 | -1/+3 |
|\| |
|
| * | add names to delivery report for sync delivery | redmatrix | 2015-09-22 | 1 | -1/+3 |
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-22 | 1 | -1/+11 |
|\| |
|
| * | report the channel sync | redmatrix | 2015-09-22 | 1 | -1/+11 |
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-22 | 2 | -0/+10 |
|\| |
|
| * | backport item sync | redmatrix | 2015-09-22 | 2 | -2/+91 |
* | | allow self delivery until we figure out why clone sync of posted items isn't ... | redmatrix | 2015-09-22 | 1 | -5/+6 |
* | | add one more test | redmatrix | 2015-09-22 | 1 | -1/+1 |
* | | fix foreach warning | redmatrix | 2015-09-22 | 1 | -1/+1 |
* | | since this is now usable, protect the displayed delivery reports from XSS inj... | redmatrix | 2015-09-22 | 1 | -1/+1 |
* | | delivery reports - crude but mostly functional at least for zot deliveries | redmatrix | 2015-09-22 | 4 | -4/+23 |
* | | Merge pull request #54 from git-marijus/master | redmatrix | 2015-09-22 | 1 | -0/+1 |
|\ \ |
|
| * | | fix consensus items - issue #53 | Mario Vavti | 2015-09-22 | 1 | -0/+1 |
* | | | remove dummy update from merge | redmatrix | 2015-09-22 | 1 | -4/+0 |
* | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-22 | 2 | -1/+5 |
|\ \ \
| | |/
| |/| |
|
| * | | dummy update | redmatrix | 2015-09-22 | 3 | -3/+7 |
* | | | heavy lifting for delivery reports | redmatrix | 2015-09-22 | 9 | -4/+105 |
| |/
|/| |
|
* | | more progress on delivery reports. Store the remote results from zot sites lo... | redmatrix | 2015-09-21 | 1 | -0/+15 |
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-21 | 2 | -123/+129 |
|\| |
|