aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | new hook interface (the old one still works but requires handlers to have ↵redmatrix2016-04-216-17/+110
| | | | | | | | | | | | | | | | | | | | | | | | two calling arguments; the first of which is no longer used). The new interface is called from Zotlabs\Extend\Hook::register() and allows you to specify which hook version to use. The default will be the new interface with one function argument. We also implement the hook priority field which was always there but needed to be set manually in the DB. This provides a way for two hook handlers that implement the same hook interface to determine which order to be called in the event of conflicts.
* | | | | | provide a way for the router to support custom controller objects and allow ↵redmatrix2016-04-211-11/+28
| | | | | | | | | | | | | | | | | | | | | | | | plugins to register class objects as modules instead of the traditional procedural interface.
* | | | | | Merge branch 'master' into devredmatrix2016-04-212-13/+13
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_mergeredmatrix2016-04-211-12/+12
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #349 from HaakonME/mastergit-marijus2016-04-211-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 Eriksen2016-04-191-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | appending the 'insecure' argument
| | | * | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-04-187-11602/+11633
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-04-161-1/+1
| | | |\ \ \ \ \ \
| | | * | | | | | | Commented out extra repos except official addonsHaakon Meland Eriksen2016-04-161-12/+12
| | | | | | | | | |
| * | | | | | | | | revup #337redmatrix2016-04-211-1/+1
| |/ / / / / / / /
* | | | | / / / / change the 404 warning from the router to reflect the new architectureredmatrix2016-04-201-4/+5
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | make the cookie check agnostic to cookie stateredmatrix2016-04-201-5/+3
| | | | | | | |
* | | | | | | | revert the reversal of checkjs logic, but still restrict the behaviour scope ↵redmatrix2016-04-204-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to just those urls that require it
* | | | | | | | send the correct number of argsredmatrix2016-04-201-1/+1
| | | | | | | |
* | | | | | | | We no longer require the diaspora_meta service locally.redmatrix2016-04-201-3/+3
| | | | | | | |
* | | | | | | | Merge branch 'dmeta' into devredmatrix2016-04-202-8/+28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | several diaspora changes/fixes
| * | | | | | | | There is no longer a followup flag in the notifier. Remove all traces of it.redmatrix2016-04-201-2/+0
| | | | | | | | |
| * | | | | | | | Merge branch 'dev' into dmetaredmatrix2016-04-207-169/+11
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | bb2d updates from testing signature changesredmatrix2016-04-201-5/+5
| | | | | | | | |
| * | | | | | | | testing dmetaredmatrix2016-04-191-6/+5
| | | | | | | | |
| * | | | | | | | rework bb2diaspora for eradicating the diaspora comment virusredmatrix2016-04-191-3/+26
| | | | | | | | |
| * | | | | | | | Revert the last edit on this file. Need to work this through a bit more ↵redmatrix2016-04-191-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before changing this bit.
| * | | | | | | | second phase of diaspora comment virus eradication beginsredmatrix2016-04-191-17/+15
| | | | | | | | |
* | | | | | | | | upgrade std revredmatrix2016-04-201-1/+1
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'master' into devredmatrix2016-04-202-3/+9
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | some crossbrowser rendering work on the comment boxMario Vavti2016-04-201-1/+3
| | | | | | | |
| * | | | | | | Use stopImmidiatePropagation() only if we are in a list to not interfere ↵Mario Vavti2016-04-201-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with other keypress listeners (e.g. chat).
* | | | | | | | Merge branch 'master' into devredmatrix2016-04-201-1/+1
|\| | | | | | |
| * | | | | | | revup #337redmatrix2016-04-201-1/+1
| | | | | | | |
* | | | | | | | missing class instance pointer in Pconfig module upgraderedmatrix2016-04-191-1/+1
| | | | | | | |
* | | | | | | | remove test files which were committed by accidentredmatrix2016-04-193-164/+0
| |/ / / / / / |/| | | | | |
* | | | | | | Merge branch 'master' into devredmatrix2016-04-191-1/+1
|\| | | | | | | |_|_|_|/ / |/| | | | |
| * | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_mergeredmatrix2016-04-192-1/+4
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | revup #337redmatrix2016-04-191-1/+1
| | | | | |
* | | | | | a bit more namespace wranglingredmatrix2016-04-185-9/+9
| | | | | |
* | | | | | module updatesredmatrix2016-04-18317-26132/+27211
| | | | | |
* | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-182-1/+4
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'master' into devMario Vavti2016-04-181-0/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | bring back bbcode buttons for mod/editpostMario Vavti2016-04-181-0/+1
| | | | | |
| * | | | | Merge branch 'master' into devMario Vavti2016-04-181-1/+3
| |\| | | |
| | * | | | fix rpost bbcode buttons and autocompleteMario Vavti2016-04-181-1/+3
| | |/ / /
* | / / / convert all the _well_known service controllers which are a bit touchy when ↵redmatrix2016-04-189-228/+253
|/ / / / | | | | | | | | | | | | it comes to the router
* | | | Merge branch 'master' into devredmatrix2016-04-185-11601/+11629
|\| | |
| * | | revup #337redmatrix2016-04-181-1/+1
| | | |
| * | | Spanish and Dutch strings updatejeroenpraat2016-04-174-11600/+11628
| | | |
* | | | some issues with GNU-Social's implementation of events in feeds. The summary ↵redmatrix2016-04-181-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_mergeredmatrix2016-04-1720-315/+348
|\ \ \ \
| * | | | Making sure the great new context help works with all thmes and schema's ↵jeroenpraat2016-04-186-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-helpredmatrix2016-04-1815-315/+292
| |\ \ \ \ | | | | | | | | | | | | New help panel that slides in from the top and pushes the content ...
| | * | | | Recover lost language translation accommodation and doc/context restructuringAndrew Manning2016-04-1712-110/+38
| | | | | |