aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Revert "revert inline-block for blockquote""redmatrix2016-04-251-1/+0
* Revert "revert inline-block for blockquote"redmatrix2016-04-251-0/+1
* remove global db variableredmatrix2016-04-256-98/+87
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-254-51/+69
|\
| * Merge pull request #355 from Treer/document_tweaksredmatrix2016-04-253-50/+69
| |\
| | * merged duplicate entry in docsTreer2016-04-251-10/+12
| | * add default_photo_profile to docsTreer2016-04-253-43/+60
| |/
| * revert inline-block for blockquoteMario Vavti2016-04-241-1/+0
* | Merge branch 'master' into devredmatrix2016-04-251-1/+1
|\ \ | |/ |/|
| * revupredmatrix2016-04-251-1/+1
* | add some missing hook entries to the docoredmatrix2016-04-232-2/+35
* | updated doco to document how to use hook callbacks which are object methodsredmatrix2016-04-231-0/+24
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-2339-1567/+1876
|\ \
| * | fix context help position with narrow navbarMario Vavti2016-04-232-0/+5
| * | update jquery.textcomplete to version 1.3.4 and add minified versionMario Vavti2016-04-233-144/+444
| * | update smarty to version 3.1.29Mario Vavti2016-04-2329-1337/+1371
| * | make the link to /help in dropdown conditional to the use of context helpMario Vavti2016-04-231-1/+1
| * | bump std version to prevent issues with context help js changesMario Vavti2016-04-231-1/+1
| * | pull-right is not needed hereMario Vavti2016-04-231-1/+1
| * | simplify context help js and move it to main.js where all the nav related js ...Mario Vavti2016-04-235-83/+51
| * | only display help button in collapsed panel if context help is enabledMario Vavti2016-04-231-2/+4
* | | this should work to call a hook for a string class methodredmatrix2016-04-231-2/+12
* | | Class method support for hooksredmatrix2016-04-232-2/+13
|/ /
* | 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 stringsphellmes2016-04-222-7224/+7467
| | |/
| * / revupredmatrix2016-04-231-1/+1
| |/
* | 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 i...Mario Vavti2016-04-221-2/+2
* | | 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
* | No idea how long RSD (Really Simple Discovery) has been broken. I had no idea...redmatrix2016-04-213-21/+25
* | 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
| * | Merge pull request #351 from anaqreon/toggle-context-helpgit-marijus2016-04-216-51/+65
| |\ \
| | * | Added admin/site setting that toggles context help panel. If disabled, origin...Andrew Manning2016-04-214-48/+57
| | * | 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}Mario Vavti2016-04-191-5/+11
* | | | | | new hook interface (the old one still works but requires handlers to have two...redmatrix2016-04-216-17/+110
* | | | | | provide a way for the router to support custom controller objects and allow p...redmatrix2016-04-211-11/+28
* | | | | | Merge branch 'master' into devredmatrix2016-04-212-13/+13
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 02:21:57 +0000