| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Merge branch 'master' into dev | redmatrix | 2016-04-22 | 2 | -5131/+5301 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | revup | redmatrix | 2016-04-22 | 2 | -5131/+5301 | |
| * | | | more doco | redmatrix | 2016-04-22 | 1 | -4/+4 | |
| | |/ |/| | ||||||
| * | | Some issues discovered with linkinfo module, and update the doco about using ... | redmatrix | 2016-04-21 | 2 | -23/+31 | |
| * | | No idea how long RSD (Really Simple Discovery) has been broken. I had no idea... | redmatrix | 2016-04-21 | 3 | -21/+25 | |
| * | | updated help/plugins to reflect some of the new interfaces and procedures | redmatrix | 2016-04-21 | 1 | -18/+34 | |
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-21 | 8 | -102/+125 | |
| |\ \ | ||||||
| | * | | remove obsolete class | Mario Vavti | 2016-04-21 | 1 | -4/+0 | |
| | * | | indicate if we will be displayed contextual help or default help | Mario Vavti | 2016-04-21 | 2 | -3/+7 | |
| | * | | fix help button for collapsed state | Mario Vavti | 2016-04-21 | 3 | -5/+6 | |
| | * | | some fixes for contextual help and disable transition animation for now - it ... | Mario Vavti | 2016-04-21 | 4 | -55/+57 | |
| | * | | Merge pull request #351 from anaqreon/toggle-context-help | git-marijus | 2016-04-21 | 6 | -51/+65 | |
| | |\ \ | ||||||
| | | * | | Added admin/site setting that toggles context help panel. If disabled, origin... | Andrew Manning | 2016-04-21 | 4 | -48/+57 | |
| | | * | | Merge branch 'dev' into toggle-context-help | Andrew Manning | 2016-04-20 | 326 | -26364/+27310 | |
| | | |\ \ | ||||||
| | | * | | | Try toggling context help using onclick attribute | Andrew Manning | 2016-04-19 | 4 | -4/+9 | |
| | * | | | | Merge pull request #348 from git-marijus/dev | git-marijus | 2016-04-21 | 1 | -5/+11 | |
| | |\ \ \ \ | ||||||
| | | * | | | | add querystring to css and js which is added via head_add_{css, js} | Mario Vavti | 2016-04-19 | 1 | -5/+11 | |
| * | | | | | | new hook interface (the old one still works but requires handlers to have two... | redmatrix | 2016-04-21 | 6 | -17/+110 | |
| * | | | | | | provide a way for the router to support custom controller objects and allow p... | redmatrix | 2016-04-21 | 1 | -11/+28 | |
| * | | | | | | Merge branch 'master' into dev | redmatrix | 2016-04-21 | 2 | -13/+13 | |
| |\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | ||||||
| | * | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge | redmatrix | 2016-04-21 | 1 | -12/+12 | |
| | |\ \ \ \ \ | ||||||
| | | * \ \ \ \ | Merge pull request #349 from HaakonME/master | git-marijus | 2016-04-21 | 1 | -12/+12 | |
| | | |\ \ \ \ \ | ||||||
| | | | * | | | | | Updated Hubzilla on OpenShift deploy script to include unofficial repos by ap... | Haakon Meland Eriksen | 2016-04-19 | 1 | -19/+19 | |
| | | | * | | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-04-18 | 7 | -11602/+11633 | |
| | | | |\ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-04-16 | 1 | -1/+1 | |
| | | | |\ \ \ \ \ \ | ||||||
| | | | * | | | | | | | Commented out extra repos except official addons | Haakon Meland Eriksen | 2016-04-16 | 1 | -12/+12 | |
| | * | | | | | | | | | revup #337 | redmatrix | 2016-04-21 | 1 | -1/+1 | |
| | |/ / / / / / / / | ||||||
| * | | | | / / / / | change the 404 warning from the router to reflect the new architecture | redmatrix | 2016-04-20 | 1 | -4/+5 | |
| | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | | make the cookie check agnostic to cookie state | redmatrix | 2016-04-20 | 1 | -5/+3 | |
| * | | | | | | | | revert the reversal of checkjs logic, but still restrict the behaviour scope ... | redmatrix | 2016-04-20 | 4 | -7/+20 | |
| * | | | | | | | | send the correct number of args | redmatrix | 2016-04-20 | 1 | -1/+1 | |
| * | | | | | | | | We no longer require the diaspora_meta service locally. | redmatrix | 2016-04-20 | 1 | -3/+3 | |
| * | | | | | | | | Merge branch 'dmeta' into dev | redmatrix | 2016-04-20 | 2 | -8/+28 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | There is no longer a followup flag in the notifier. Remove all traces of it. | redmatrix | 2016-04-20 | 1 | -2/+0 | |
| | * | | | | | | | | Merge branch 'dev' into dmeta | redmatrix | 2016-04-20 | 7 | -169/+11 | |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | ||||||
| | * | | | | | | | | bb2d updates from testing signature changes | redmatrix | 2016-04-20 | 1 | -5/+5 | |
| | * | | | | | | | | testing dmeta | redmatrix | 2016-04-19 | 1 | -6/+5 | |
| | * | | | | | | | | rework bb2diaspora for eradicating the diaspora comment virus | redmatrix | 2016-04-19 | 1 | -3/+26 | |
| | * | | | | | | | | Revert the last edit on this file. Need to work this through a bit more befor... | redmatrix | 2016-04-19 | 1 | -15/+17 | |
| | * | | | | | | | | second phase of diaspora comment virus eradication begins | redmatrix | 2016-04-19 | 1 | -17/+15 | |
| * | | | | | | | | | upgrade std rev | redmatrix | 2016-04-20 | 1 | -1/+1 | |
| | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | | Merge branch 'master' into dev | redmatrix | 2016-04-20 | 2 | -3/+9 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | | some crossbrowser rendering work on the comment box | Mario Vavti | 2016-04-20 | 1 | -1/+3 | |
| | * | | | | | | | Use stopImmidiatePropagation() only if we are in a list to not interfere with... | Mario Vavti | 2016-04-20 | 1 | -2/+6 | |
| * | | | | | | | | Merge branch 'master' into dev | redmatrix | 2016-04-20 | 1 | -1/+1 | |
| |\| | | | | | | | ||||||
| | * | | | | | | | revup #337 | redmatrix | 2016-04-20 | 1 | -1/+1 | |
| * | | | | | | | | missing class instance pointer in Pconfig module upgrade | redmatrix | 2016-04-19 | 1 | -1/+1 | |
| * | | | | | | | | remove test files which were committed by accident | redmatrix | 2016-04-19 | 3 | -164/+0 | |
| | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | | Merge branch 'master' into dev | redmatrix | 2016-04-19 | 1 | -1/+1 | |
| |\| | | | | | | |_|_|_|/ / |/| | | | | | ||||||
| | * | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge | redmatrix | 2016-04-19 | 2 | -1/+4 | |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | ||||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |