| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-22 | 4 | -1318/+1398 |
| |\ | |||||
| | * | Update NL + ES_ES | jeroenpraat | 2016-05-22 | 4 | -1318/+1398 |
| | | | |||||
| * | | renamed include files identity.php (channel.php) and Contact.php ↵ | redmatrix | 2016-05-22 | 62 | -240/+194 |
| | | | | | | | | | (connections.php) | ||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-21 | 6 | -671/+721 |
| |\| | |||||
| | * | Merge pull request #400 from anaqreon/plugin-repo-path | hubzilla | 2016-05-22 | 1 | -8/+14 |
| | |\ | | | | | | | Plugin repo path | ||||
| | | * | Temp repo folder error message correction | Andrew Manning | 2016-05-21 | 1 | -2/+2 |
| | | | | |||||
| | | * | Moved git repository storage to store/[data]/git to avoid collision with a ↵ | Andrew Manning | 2016-05-21 | 1 | -8/+14 |
| | | | | | | | | | | | | | channel named git. Fixed bug where temp repo folder was never created. | ||||
| | * | | Merge pull request #399 from phellmes/de20160521 | hubzilla | 2016-05-22 | 2 | -661/+701 |
| | |\ \ | | |/ | |/| | Update DE translation strings | ||||
| | | * | Update DE translation strings | phellmes | 2016-05-21 | 2 | -661/+701 |
| | |/ | |||||
| | * | revert fix for #385 | Mario Vavti | 2016-05-21 | 1 | -4/+0 |
| | | | |||||
| | * | possible better fix for #385 | Mario Vavti | 2016-05-21 | 2 | -2/+5 |
| | | | |||||
| | * | possible fix for #385 | Mario Vavti | 2016-05-21 | 3 | -1/+6 |
| | | | |||||
| * | | include new finger backend | redmatrix | 2016-05-21 | 1 | -0/+130 |
| | | | |||||
| * | | finish updating zot_finger instances | redmatrix | 2016-05-21 | 10 | -44/+29 |
| | | | |||||
| * | | first cut at zot-finger request signatures | redmatrix | 2016-05-21 | 2 | -8/+14 |
| |/ | |||||
| * | relocate the (unused currently) protocol driver | redmatrix | 2016-05-20 | 2 | -26/+32 |
| | | |||||
| * | rework the conversation object stuff at a high level - still needs a bit of ↵ | redmatrix | 2016-05-20 | 21 | -98/+44 |
| | | | | | refactoring | ||||
| * | remove redundant include | redmatrix | 2016-05-20 | 1 | -3/+0 |
| | | |||||
| * | consolidate include/*_selectors.php (not touching acl_selectors for the ↵ | redmatrix | 2016-05-20 | 8 | -104/+77 |
| | | | | | moment, as it will likely end up with a different disposition) | ||||
| * | code comments | redmatrix | 2016-05-20 | 1 | -3/+4 |
| | | |||||
| * | move template stuff to zotlabs/render | redmatrix | 2016-05-20 | 8 | -129/+145 |
| | | |||||
| * | cleanup proc_run after messing it up with debugging yesterday | redmatrix | 2016-05-20 | 3 | -34/+38 |
| | | |||||
| * | recurse one more level of array when processing args | redmatrix | 2016-05-20 | 1 | -1/+8 |
| | | |||||
| * | add some backtrace to find the issue | redmatrix | 2016-05-20 | 1 | -1/+6 |
| | | |||||
| * | case issue | redmatrix | 2016-05-20 | 3 | -506/+539 |
| | | |||||
| * | update the installation text for the cron setup | redmatrix | 2016-05-19 | 1 | -4/+4 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-19 | 3 | -15/+60 |
| |\ | |||||
| | * | Merge pull request #397 from git-marijus/dev | hubzilla | 2016-05-20 | 3 | -15/+60 |
| | |\ | | | | | | | provide an acl select option for only me | ||||
| | | * | whitespace | Mario Vavti | 2016-05-19 | 1 | -1/+1 |
| | | | | |||||
| | | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-05-19 | 3 | -28/+37 |
| | | |\ | | |/ | |/| | |||||
| | | * | provide an acl select option for only me | Mario Vavti | 2016-05-19 | 3 | -15/+60 |
| | | | | |||||
| * | | | remove test file | redmatrix | 2016-05-19 | 1 | -13/+0 |
| | | | | |||||
| * | | | roll minor version, change example text | redmatrix | 2016-05-19 | 2 | -2/+2 |
| | | | | |||||
| * | | | typo uncovered during tests | redmatrix | 2016-05-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | daemon conversion continued... | redmatrix | 2016-05-19 | 49 | -1804/+66 |
| | | | | |||||
| * | | | cleanup of daemon infrastructure | redmatrix | 2016-05-19 | 2 | -5/+10 |
| | | | | |||||
| * | | | Separate cron into periodic components and use that as the main interface ↵ | redmatrix | 2016-05-19 | 5 | -232/+322 |
| | | | | | | | | | | | | | for scheduled tasks instead of the quaint 'poller'. | ||||
| * | | | don't try to deliver empty hashes | redmatrix | 2016-05-19 | 2 | -0/+6 |
| | | | | |||||
| * | | | daemon master: create some compatibility code | redmatrix | 2016-05-19 | 8 | -449/+34 |
| | | | | |||||
| * | | | first phase of daemon refactoring | redmatrix | 2016-05-19 | 18 | -0/+2122 |
| | | | | |||||
| * | | | minor | redmatrix | 2016-05-19 | 2 | -0/+5 |
| |/ / | |||||
| * | | Merge pull request #395 from anaqreon/plugin-repo-ui | hubzilla | 2016-05-20 | 2 | -18/+35 |
| |\ \ | | | | | | | Plugin repo ui | ||||
| | * | | Replace text strings for translation support | Andrew Manning | 2016-05-19 | 2 | -10/+6 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'upstream/dev' into plugin-repo-ui | Andrew Manning | 2016-05-19 | 7 | -17/+36 |
| | |\| | |||||
| | * | | Improved plugin repo management UI in admin/plugins | Andrew Manning | 2016-05-19 | 1 | -17/+38 |
| | | | | |||||
| * | | | Merge pull request #396 from Treer/permissions | hubzilla | 2016-05-20 | 1 | -10/+2 |
| |\ \ \ | |_|/ |/| | | fix permission string | ||||
| | * | | fix permission string | Treer | 2016-05-19 | 1 | -10/+2 |
| |/ / | |||||
| * | | issue #391 - htmlspecialchars_decode before firing up jot, which re-encodes | redmatrix | 2016-05-19 | 1 | -2/+2 |
| | | | |||||
| * | | one more text clarification | redmatrix | 2016-05-18 | 1 | -1/+1 |
| | | | |||||
| * | | text clarifications | redmatrix | 2016-05-18 | 3 | -3/+3 |
| | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |