aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into help-contentAndrew Manning2016-04-2723-15602/+16085
|\
| * some refinements on jotMario Vavti2016-04-274-37/+30
| * Merge branch 'master' into devredmatrix2016-04-271-1/+1
| |\
| | * revupredmatrix2016-04-271-1/+1
| * | implement the singleton delivery stuffredmatrix2016-04-263-8/+38
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-265-51/+36
| |\ \
| | * | only padding-top needs adjustmentMario Vavti2016-04-261-2/+2
| | * | hopefully fix jot dropdown visibility issueMario Vavti2016-04-261-3/+5
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-04-262-7/+13
| | |\ \
| | * | | move spoiler= and quote= bbcode handling from prepare_body() to bbcode() and ...Mario Vavti2016-04-263-46/+29
| * | | | move iconfig functions to include/config.php with all the rest of the configs...redmatrix2016-04-265-160/+179
| | |/ / | |/| |
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-261-0/+9
| |\| |
| | * | fix top padding for narrow navbarMario Vavti2016-04-261-0/+9
| * | | Merge branch 'master' into devredmatrix2016-04-261-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | revupredmatrix2016-04-261-1/+1
| * | | some cleanup on the mysqli driverredmatrix2016-04-251-6/+12
| | |/ | |/|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-2512-15360/+15804
| |\ \
| | * \ Merge pull request #356 from Treer/CUIredmatrix2016-04-262-2/+97
| | |\ \
| | | * | improve error message in config and pconfigTreer2016-04-252-0/+13
| | | * | util/pconfig can list channel IDsTreer2016-04-251-1/+13
| | | * | add commandline help to util/pconfigTreer2016-04-251-0/+34
| | | * | add commandline help to util/configTreer2016-04-251-2/+38
| | * | | +es-es strings updatejeroenpraat2016-04-254-15342/+15688
| * | | | Setup was horked after this commit and I couldn't easily make it right so rev...redmatrix2016-04-256-87/+98
| * | | | 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 remote-tracking branch 'upstream/dev' into help-contentAndrew Manning2016-04-2553-1636/+2042
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | make it more obvious what is behind the dropdownsMario Vavti2016-04-256-16/+19
| |/ / /
| * | | 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
| * | | 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 '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
| |/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 00:54:55 +0000