| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-09-21 | 9 | -27/+63 |
| |\ | |||||
| | * | looks like chat has been neglected a bit recently | redmatrix | 2015-09-20 | 6 | -8/+7 |
| | | | |||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-20 | 2 | -13/+43 |
| | |\ | | | | | | | | | | | | | Conflicts: include/zot.php | ||||
| | | * | new delivery report format | redmatrix | 2015-09-20 | 2 | -13/+42 |
| | | | | |||||
| | * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-20 | 1 | -3/+1 |
| | |\| | | | | | | | | | | | | | Conflicts: include/zot.php | ||||
| | | * | improve on the last attempt | redmatrix | 2015-09-20 | 1 | -4/+4 |
| | | | | |||||
| | * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-20 | 1 | -4/+13 |
| | |\| | | | | | | | | | | | | | Conflicts: include/zot.php | ||||
| | | * | catch the timestamp also | redmatrix | 2015-09-20 | 1 | -1/+1 |
| | | | | |||||
| | | * | remove system flags from channel import packet | redmatrix | 2015-09-20 | 1 | -5/+9 |
| | | | | |||||
| | * | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-09-20 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | kick right aside out a little earlier | Mario Vavti | 2015-09-20 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-20 | 1 | -1/+1 |
| | |\ \ \ | | |/ / | |/| / | | |/ | | | | Conflicts: include/zot.php | ||||
| | | * | we need the xchan record also | redmatrix | 2015-09-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Removed hot_deploy | Haakon Meland Eriksen | 2015-09-20 | 1 | -0/+0 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-09-20 | 3 | -18/+66 |
| |\| | | |||||
| | * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-20 | 2 | -1/+47 |
| | |\| | |||||
| | | * | initial checkin delivery report class | redmatrix | 2015-09-20 | 2 | -1/+47 |
| | | | | |||||
| | * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-19 | 2 | -1/+2 |
| | |\| | | | | | | | | | | | | | Conflicts: include/zot.php | ||||
| | | * | clone new connection requests | redmatrix | 2015-09-19 | 2 | -19/+20 |
| | | | | |||||
| | * | | clone new connections | redmatrix | 2015-09-19 | 1 | -17/+18 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-09-19 | 14 | -20/+122 |
| |\| | | |||||
| | * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-18 | 1 | -1/+1 |
| | |\| | |||||
| | | * | include site identitfier on redmatrix delivery reports also | redmatrix | 2015-09-18 | 1 | -0/+2 |
| | | | | |||||
| | * | | DB table for delivery reports | redmatrix | 2015-09-18 | 3 | -1/+86 |
| | | | | |||||
| | * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-18 | 8 | -14/+21 |
| | |\| | | | | | | | | | | | | | Conflicts: util/messages.po | ||||
| | | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-18 | 5 | -11/+14 |
| | | |\ | |||||
| | | | * | Another (hopefully final) Spanish update | jeroenpraat | 2015-09-17 | 2 | -5/+5 |
| | | | | | |||||
| | | | * | fix calculation of content height with margins | Mario Vavti | 2015-09-17 | 3 | -6/+9 |
| | | | | | |||||
| | | * | | dummy update | redmatrix | 2015-09-18 | 4 | -8/+12 |
| | | |/ | |||||
| | * | | add reporting site to delivery report | redmatrix | 2015-09-18 | 3 | -1/+7 |
| | | | | |||||
| | * | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-09-18 | 8 | -1/+8 |
| | |\ \ | |||||
| | * | | | more work on surviving hub re-installs | redmatrix | 2015-09-18 | 2 | -4/+8 |
| | | | | | |||||
| * | | | | Added hot_deploy directly to .openshift/makers/hot_deploy | Haakon Meland Eriksen | 2015-09-18 | 1 | -0/+0 |
| | | | | | |||||
| * | | | | Added hot_deploy to deploy script - fixed echo | Haakon Meland Eriksen | 2015-09-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-09-18 | 75 | -761/+964 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | css fixes | Mario Vavti | 2015-09-18 | 8 | -1/+8 |
| | |/ / | |||||
| | * | | change photo permissions when attach permissions are changed through ↵ | redmatrix | 2015-09-18 | 3 | -4/+14 |
| | | | | | | | | | | | | | mod/filestorage, and fix lockview for photos. | ||||
| | * | | start hooking in the new webfinger/zot merged discovery | redmatrix | 2015-09-17 | 1 | -6/+10 |
| | | | | |||||
| | * | | consolidate zotfinger and webfinger | redmatrix | 2015-09-17 | 5 | -291/+299 |
| | | | | |||||
| | * | | Converse width for a few related (old) schemas back to 1024px / Name default ↵ | jeroenpraat | 2015-09-17 | 6 | -6/+15 |
| | | | | | | | | | | | | | theme to Focus / Non expert custom display settings above expert display settings, so people can better find them. | ||||
| | * | | missing refernce to array | Mario Vavti | 2015-09-17 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-09-17 | 3 | -5/+5 |
| | |\ \ | |||||
| | | * \ | Merge pull request #46 from anaqreon/master | git-marijus | 2015-09-17 | 3 | -5/+5 |
| | | |\ \ | | | | | | | | | | | Corrected some missing space typos in docs | ||||
| | | | * | | Corrected some missing space typos in docs | Andrew Manning | 2015-09-17 | 3 | -5/+5 |
| | | | | | | |||||
| | * | | | | quickfix for private messages - needs a lot more work | Mario Vavti | 2015-09-17 | 5 | -48/+56 |
| | |/ / / | |||||
| | * / / | Revert "moved submit button to the bottom in settings.tpl" | Mario Vavti | 2015-09-17 | 1 | -5/+7 |
| | |/ / | | | | | | | | | | This reverts commit 1500691cc22443aac9bb6af409f8bbd64787a9e9. | ||||
| | * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-16 | 1 | -1/+1 |
| | |\| | |||||
| | | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-16 | 12 | -197/+199 |
| | | |\ | |||||
| | | * | | push revision | redmatrix | 2015-09-16 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-16 | 0 | -0/+0 |
| | |\ \ \ | | | |/ | | |/| | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |