| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | a clear is needed after floating | Mario Vavti | 2015-09-28 | 1 | -1/+1 |
| | | |||||
| * | private mail: bring additional inbox/outbox views and ajaxify single message ↵ | Mario Vavti | 2015-09-28 | 7 | -32/+39 |
| | | | | | drop | ||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-27 | 1 | -4/+6 |
| |\ | | | | | | | | | Conflicts: include/zot.php | ||||
| | * | well there's one problem... | redmatrix | 2015-09-27 | 1 | -4/+4 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-27 | 5 | -2795/+2335 |
| |\| | | | | | | | | | | | Conflicts: include/zot.php util/messages.po | ||||
| | * | 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 ↵ | redmatrix | 2015-09-26 | 33 | -15/+134666 |
| | | | | | | | | | endless merge conflicts. | ||||
| * | | 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 ↵ | redmatrix | 2015-09-26 | 2 | -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 ↵ | jeroenpraat | 2015-09-25 | 15 | -0/+0 |
| |/ / | | | | | | | avatar and uploaded 6 logo variants. Originals courtesy of Iko. | ||||
| * | | 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, ↵ | redmatrix | 2015-09-24 | 1 | -2/+50 |
| | | | | | | | | | and translateable | ||||
| * | | add Diaspora (actually any external service which uses the queue) to ↵ | redmatrix | 2015-09-24 | 1 | -0/+8 |
| | | | | | | | | | delivery reports | ||||
| * | | 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 | ||||
| | | * | | 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 |
| |\| | | | | | | | | | Conflicts: install/update.php | ||||
| | * | 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 |
| |\| | | | | | | | | | Conflicts: include/items.php | ||||
| | * | 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 |
| |\| | | | | | | | | | Conflicts: include/zot.php | ||||
| | * | 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 |
| |\| | | | | | | | | | | | Conflicts: include/items.php include/zot.php | ||||
| | * | 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 |
| | | | | | | | | | doing it's thing | ||||
| * | | 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 ↵ | redmatrix | 2015-09-22 | 1 | -1/+1 |
| | | | | | | | | | injection | ||||
| * | | 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 | ||||
| | * | | 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 |
| |\ \ \ | | |/ | |/| | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |