| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | ||||
| | | | * | Updated Hubzilla on OpenShift deploy script to include unofficial repos by ↵ | Haakon Meland Eriksen | 2016-04-19 | 1 | -19/+19 |
| | | | | | | | | | | | | | | | | | appending the 'insecure' argument | ||||
| | | | * | 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 |
| | | | | | | | | | | | | | | | | | | | | | to just those urls that require it | ||||
| * | | | | | 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 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | several diaspora changes/fixes | ||||
| | * | | | | | 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 ↵ | redmatrix | 2016-04-19 | 1 | -15/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before changing this bit. | ||||
| | * | | | | | | 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 ↵ | Mario Vavti | 2016-04-20 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | with other keypress listeners (e.g. chat). | ||||
| * | | | | | | 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 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | | revup #337 | redmatrix | 2016-04-19 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | a bit more namespace wrangling | redmatrix | 2016-04-18 | 5 | -9/+9 |
| | | | | | | |||||
| * | | | | | module updates | redmatrix | 2016-04-18 | 317 | -26132/+27211 |
| | | | | | | |||||
| * | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-18 | 2 | -1/+4 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into dev | Mario Vavti | 2016-04-18 | 1 | -0/+1 |
| | |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | | bring back bbcode buttons for mod/editpost | Mario Vavti | 2016-04-18 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' into dev | Mario Vavti | 2016-04-18 | 1 | -1/+3 |
| | |\| | | | | |||||
| | | * | | | | fix rpost bbcode buttons and autocomplete | Mario Vavti | 2016-04-18 | 1 | -1/+3 |
| | | |/ / / | |||||
| * | / / / | convert all the _well_known service controllers which are a bit touchy when ↵ | redmatrix | 2016-04-18 | 9 | -228/+253 |
| |/ / / / | | | | | | | | | | | | | it comes to the router | ||||
| * | | | | Merge branch 'master' into dev | redmatrix | 2016-04-18 | 5 | -11601/+11629 |
| |\| | | | |||||
| | * | | | revup #337 | redmatrix | 2016-04-18 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Spanish and Dutch strings update | jeroenpraat | 2016-04-17 | 4 | -11600/+11628 |
| | | | | | |||||
| * | | | | some issues with GNU-Social's implementation of events in feeds. The summary ↵ | redmatrix | 2016-04-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | element is over-riding content, so put summary into the xcal namespace. Some investigation reveals that both projects are non-compliant in the xcal space. Will deal with this later. | ||||
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-17 | 20 | -315/+348 |
| |\ \ \ \ | |||||
| | * | | | | Making sure the great new context help works with all thmes and schema's ↵ | jeroenpraat | 2016-04-18 | 6 | -6/+62 |
| | | | | | | | | | | | | | | | | | | | | | (3rd party themes: maybe abit of tweaking is still needed). Also fixing some minor cosmetic things. | ||||
| | * | | | | Merge pull request #345 from anaqreon/context-help | redmatrix | 2016-04-18 | 15 | -315/+292 |
| | |\ \ \ \ | | | | | | | | | | | | | New help panel that slides in from the top and pushes the content ... | ||||
| | | * | | | | Recover lost language translation accommodation and doc/context restructuring | Andrew Manning | 2016-04-17 | 12 | -110/+38 |
| | | | | | | | |||||
| | | * | | | | New help panel that slides in from the top and pushes the content down so it ↵ | Andrew Manning | 2016-04-17 | 3 | -205/+254 |
| | |/ / / / | | | | | | | | | | | | | | | | is not covered. Panel toggles with help button. Still some bugs with small screen viewing. | ||||
| * | | | | | pull in the new object router and a few selected samples for the new ↵ | redmatrix | 2016-04-17 | 5 | -1896/+1917 |
| | | | | | | | | | | | | | | | | | | | | | controller layout | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |