| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-27 | 11 | -40/+78 |
| |\ | |||||
| | * | Merge pull request #359 from anaqreon/help-content | redmatrix | 2016-04-28 | 7 | -3/+48 |
| | |\ | | | | | | | Help content | ||||
| | | * | Added context help content | Andrew Manning | 2016-04-27 | 5 | -1/+29 |
| | | | | |||||
| | | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into help-content | Andrew Manning | 2016-04-27 | 23 | -15602/+16085 |
| | | |\ | | |/ | |/| | |||||
| | * | | some refinements on jot | Mario Vavti | 2016-04-27 | 4 | -37/+30 |
| | | | | |||||
| | | * | Merge remote-tracking branch 'upstream/dev' into help-content | Andrew Manning | 2016-04-25 | 53 | -1636/+2042 |
| | | |\ | |||||
| | | * \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into help-content | Andrew Manning | 2016-04-23 | 4 | -7227/+7472 |
| | | |\ \ | |||||
| | | * | | | Added help content | Andrew Manning | 2016-04-22 | 3 | -3/+20 |
| | | | | | | |||||
| * | | | | | Use / for album name in photo activities if no album present. | redmatrix | 2016-04-27 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Merge branch 'master' into dev | redmatrix | 2016-04-27 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | revup | redmatrix | 2016-04-27 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | implement the singleton delivery stuff | redmatrix | 2016-04-26 | 3 | -8/+38 |
| | | | | | | |||||
| * | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-26 | 5 | -51/+36 |
| |\ \ \ \ \ | |||||
| | * | | | | | only padding-top needs adjustment | Mario Vavti | 2016-04-26 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | hopefully fix jot dropdown visibility issue | Mario Vavti | 2016-04-26 | 1 | -3/+5 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-04-26 | 2 | -7/+13 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | move spoiler= and quote= bbcode handling from prepare_body() to bbcode() and ↵ | Mario Vavti | 2016-04-26 | 3 | -46/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add open tag to bbco_autocomplete | ||||
| * | | | | | | | move iconfig functions to include/config.php with all the rest of the ↵ | redmatrix | 2016-04-26 | 5 | -160/+179 |
| | |/ / / / / |/| | | | | | | | | | | | | | | | | | configs, fix an issue with singleton discovery and start work on singleton delivery | ||||
| * | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-26 | 1 | -0/+9 |
| |\| | | | | | |||||
| | * | | | | | fix top padding for narrow navbar | Mario Vavti | 2016-04-26 | 1 | -0/+9 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into dev | redmatrix | 2016-04-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | | revup | redmatrix | 2016-04-26 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | some cleanup on the mysqli driver | redmatrix | 2016-04-25 | 1 | -6/+12 |
| | |/ / / / |/| | | | | |||||
| * | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-25 | 12 | -15360/+15804 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge pull request #356 from Treer/CUI | redmatrix | 2016-04-26 | 2 | -2/+97 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | extends util/config and util/pconfig | ||||
| | | * | | | | | improve error message in config and pconfig | Treer | 2016-04-25 | 2 | -0/+13 |
| | | | | | | | | |||||
| | | * | | | | | util/pconfig can list channel IDs | Treer | 2016-04-25 | 1 | -1/+13 |
| | | | | | | | | |||||
| | | * | | | | | add commandline help to util/pconfig | Treer | 2016-04-25 | 1 | -0/+34 |
| | | | | | | | | |||||
| | | * | | | | | add commandline help to util/config | Treer | 2016-04-25 | 1 | -2/+38 |
| | | | | | | | | |||||
| | * | | | | | | +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 |
| | | | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |