aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into help-contentAndrew Manning2016-04-234-7227/+7472
|\
| * only display help button in collapsed panel if context help is enabledMario Vavti2016-04-231-2/+4
| |
| * Merge branch 'master' into devredmatrix2016-04-233-7225/+7468
| |\
| | * Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_mergeredmatrix2016-04-232-7224/+7467
| | |\
| | | * Merge pull request #352 from phellmes/de20160422redmatrix2016-04-232-7224/+7467
| | | |\ | | | | | | | | | | Update DE translation strings
| | | | * Update DE translation stringsphellmes2016-04-222-7224/+7467
| | | |/
| | * / revupredmatrix2016-04-231-1/+1
| | |/
* | / Added help contentAndrew Manning2016-04-223-3/+20
|/ /
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-221-2/+2
|\ \
| * | make it icon-question-sign for contextual and icon-question for normal help ↵Mario Vavti2016-04-221-2/+2
| | | | | | | | | | | | instead of adding a caret-down
* | | Merge branch 'master' into devredmatrix2016-04-222-5131/+5301
|\ \ \ | | |/ | |/|
| * | revupredmatrix2016-04-222-5131/+5301
| | |
* | | more docoredmatrix2016-04-221-4/+4
| |/ |/|
* | Some issues discovered with linkinfo module, and update the doco about using ↵redmatrix2016-04-212-23/+31
| | | | | | | | object modules in addons; as there were a couple of surprises.
* | No idea how long RSD (Really Simple Discovery) has been broken. I had no ↵redmatrix2016-04-213-21/+25
| | | | | | | | idea it was even here.
* | updated help/plugins to reflect some of the new interfaces and proceduresredmatrix2016-04-211-18/+34
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-218-102/+125
|\ \
| * | remove obsolete classMario Vavti2016-04-211-4/+0
| | |
| * | indicate if we will be displayed contextual help or default helpMario Vavti2016-04-212-3/+7
| | |
| * | fix help button for collapsed stateMario Vavti2016-04-213-5/+6
| | |
| * | some fixes for contextual help and disable transition animation for now - it ↵Mario Vavti2016-04-214-55/+57
| | | | | | | | | | | | looked really wired because main moved with a different speed than help-content and help-content can not be displayed under the panel as it is implemented now.
| * | Merge pull request #351 from anaqreon/toggle-context-helpgit-marijus2016-04-216-51/+65
| |\ \ | | | | | | | | Toggle context help
| | * | Added admin/site setting that toggles context help panel. If disabled, ↵Andrew Manning2016-04-214-48/+57
| | | | | | | | | | | | | | | | original help menu button behavior is restored.
| | * | Merge branch 'dev' into toggle-context-helpAndrew Manning2016-04-20326-26364/+27310
| | |\ \
| | * | | Try toggling context help using onclick attributeAndrew Manning2016-04-194-4/+9
| | | | |
| * | | | Merge pull request #348 from git-marijus/devgit-marijus2016-04-211-5/+11
| |\ \ \ \ | | | | | | | | | | | | add querystring to css and js which is added via head_add_{css, js}
| | * | | | add querystring to css and js which is added via head_add_{css, js}Mario Vavti2016-04-191-5/+11
| | | | | |
* | | | | | 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
| | | | | | | | |