| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | +es-es strings update | jeroenpraat | 2016-04-25 | 4 | -15342/+15688 | |
| | | |_|_|_|/ | |/| | | | | ||||||
| | * | | | | | make it more obvious what is behind the dropdowns | Mario Vavti | 2016-04-25 | 6 | -16/+19 | |
| | | | | | | | ||||||
| * | | | | | | Setup was horked after this commit and I couldn't easily make it right so ↵ | redmatrix | 2016-04-25 | 6 | -87/+98 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reverting - will try again at a future date Revert "remove global db variable" This reverts commit c3b0c0f32a17649503db67f208cce6f9e0cdc322. | |||||
| * | | | | | | Revert "Revert "revert inline-block for blockquote"" | redmatrix | 2016-04-25 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ae026247934f422622031c426af01101c05f4c18. | |||||
| * | | | | | | Revert "revert inline-block for blockquote" | redmatrix | 2016-04-25 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 15cfd6fda79fdaff8302f2eae91e8fc40940609a. | |||||
| * | | | | | | remove global db variable | redmatrix | 2016-04-25 | 6 | -98/+87 | |
| |/ / / / / | ||||||
| * | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-25 | 4 | -51/+69 | |
| |\| | | | | ||||||
| | * | | | | Merge pull request #355 from Treer/document_tweaks | redmatrix | 2016-04-25 | 3 | -50/+69 | |
| | |\ \ \ \ | | | | | | | | | | | | | Document tweaks | |||||
| | | * | | | | merged duplicate entry in docs | Treer | 2016-04-25 | 1 | -10/+12 | |
| | | | | | | | ||||||
| | | * | | | | add default_photo_profile to docs | Treer | 2016-04-25 | 3 | -43/+60 | |
| | |/ / / / | ||||||
| | * | | | | revert inline-block for blockquote | Mario Vavti | 2016-04-24 | 1 | -1/+0 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'master' into dev | redmatrix | 2016-04-25 | 1 | -1/+1 | |
| |\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | ||||||
| | * | | | revup | redmatrix | 2016-04-25 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | add some missing hook entries to the doco | redmatrix | 2016-04-23 | 2 | -2/+35 | |
| | | | | | ||||||
| * | | | | updated doco to document how to use hook callbacks which are object methods | redmatrix | 2016-04-23 | 1 | -0/+24 | |
| | | | | | ||||||
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-23 | 39 | -1567/+1876 | |
| |\ \ \ \ | ||||||
| | * | | | | fix context help position with narrow navbar | Mario Vavti | 2016-04-23 | 2 | -0/+5 | |
| | | | | | | ||||||
| | * | | | | update jquery.textcomplete to version 1.3.4 and add minified version | Mario Vavti | 2016-04-23 | 3 | -144/+444 | |
| | | | | | | ||||||
| | * | | | | update smarty to version 3.1.29 | Mario Vavti | 2016-04-23 | 29 | -1337/+1371 | |
| | | | | | | ||||||
| | * | | | | make the link to /help in dropdown conditional to the use of context help | Mario Vavti | 2016-04-23 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | bump std version to prevent issues with context help js changes | Mario Vavti | 2016-04-23 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | pull-right is not needed here | Mario Vavti | 2016-04-23 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | simplify context help js and move it to main.js where all the nav related js ↵ | Mario Vavti | 2016-04-23 | 5 | -83/+51 | |
| | | |_|/ | |/| | | | | | | | | | | resides, do not close the context help if we click outside of it - members might want to work on something while help is open, move the link to /help to dropdown-menu. | |||||
| | * | | | only display help button in collapsed panel if context help is enabled | Mario Vavti | 2016-04-23 | 1 | -2/+4 | |
| | | | | | ||||||
| * | | | | this should work to call a hook for a string class method | redmatrix | 2016-04-23 | 1 | -2/+12 | |
| | | | | | ||||||
| * | | | | Class method support for hooks | redmatrix | 2016-04-23 | 2 | -2/+13 | |
| |/ / / | ||||||
| * | / | Merge branch 'master' into dev | redmatrix | 2016-04-23 | 3 | -7225/+7468 | |
| |\| | | |/ |/| | ||||||
| | * | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge | redmatrix | 2016-04-23 | 2 | -7224/+7467 | |
| | |\ | ||||||
| | | * | Merge pull request #352 from phellmes/de20160422 | redmatrix | 2016-04-23 | 2 | -7224/+7467 | |
| | | |\ | | | | | | | | | Update DE translation strings | |||||
| | | | * | Update DE translation strings | phellmes | 2016-04-22 | 2 | -7224/+7467 | |
| | | |/ | ||||||
| | * / | revup | redmatrix | 2016-04-23 | 1 | -1/+1 | |
| | |/ | ||||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-22 | 1 | -2/+2 | |
| |\ \ | ||||||
| | * | | make it icon-question-sign for contextual and icon-question for normal help ↵ | Mario Vavti | 2016-04-22 | 1 | -2/+2 | |
| | | | | | | | | | | | | | instead of adding a caret-down | |||||
| * | | | Merge branch 'master' into dev | redmatrix | 2016-04-22 | 2 | -5131/+5301 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | revup | redmatrix | 2016-04-22 | 2 | -5131/+5301 | |
| | | | | ||||||
| * | | | more doco | redmatrix | 2016-04-22 | 1 | -4/+4 | |
| | |/ |/| | ||||||
| * | | Some issues discovered with linkinfo module, and update the doco about using ↵ | redmatrix | 2016-04-21 | 2 | -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 ↵ | redmatrix | 2016-04-21 | 3 | -21/+25 | |
| | | | | | | | | | idea it was even here. | |||||
| * | | updated help/plugins to reflect some of the new interfaces and procedures | redmatrix | 2016-04-21 | 1 | -18/+34 | |
| | | | ||||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-21 | 8 | -102/+125 | |
| |\ \ | ||||||
| | * | | remove obsolete class | Mario Vavti | 2016-04-21 | 1 | -4/+0 | |
| | | | | ||||||
| | * | | indicate if we will be displayed contextual help or default help | Mario Vavti | 2016-04-21 | 2 | -3/+7 | |
| | | | | ||||||
| | * | | fix help button for collapsed state | Mario Vavti | 2016-04-21 | 3 | -5/+6 | |
| | | | | ||||||
| | * | | some fixes for contextual help and disable transition animation for now - it ↵ | Mario Vavti | 2016-04-21 | 4 | -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-help | git-marijus | 2016-04-21 | 6 | -51/+65 | |
| | |\ \ | | | | | | | | | Toggle context help | |||||
| | | * | | Added admin/site setting that toggles context help panel. If disabled, ↵ | Andrew Manning | 2016-04-21 | 4 | -48/+57 | |
| | | | | | | | | | | | | | | | | | original help menu button behavior is restored. | |||||
| | | * | | Merge branch 'dev' into toggle-context-help | Andrew Manning | 2016-04-20 | 326 | -26364/+27310 | |
| | | |\ \ | ||||||
| | | * | | | Try toggling context help using onclick attribute | Andrew Manning | 2016-04-19 | 4 | -4/+9 | |
| | | | | | | ||||||
| | * | | | | Merge pull request #348 from git-marijus/dev | git-marijus | 2016-04-21 | 1 | -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 Vavti | 2016-04-19 | 1 | -5/+11 | |
| | | | | | | | ||||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |