| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-02 | 13 | -0/+395 |
| |\ | |||||
| | * | Merge pull request #364 from mjfriaza/dev | redmatrix | 2016-05-03 | 13 | -0/+395 |
| | |\ | | | | | | | Contextual help in Spanish | ||||
| | | * | Contextual help in Spanish | Manuel Jiménez Friaza | 2016-05-02 | 13 | -0/+395 |
| | | | | |||||
| * | | | a bit more oembed security - and document the shortcomings of this approach | redmatrix | 2016-05-02 | 1 | -16/+20 |
| |/ / | |||||
| * | | sort out the rest of the source categories | redmatrix | 2016-05-02 | 2 | -4/+4 |
| | | | |||||
| * | | a couple of bugfixes from earlier checkins and implementation of source tags | redmatrix | 2016-05-01 | 5 | -7/+50 |
| | | | |||||
| * | | db schema change to add tags to content sources | redmatrix | 2016-05-01 | 4 | -3/+14 |
| | | | |||||
| * | | sort addons based on the internal display name instead of the filename | redmatrix | 2016-05-01 | 1 | -0/+7 |
| | | | |||||
| * | | use only the std_version | redmatrix | 2016-05-01 | 7 | -20/+13 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-01 | 7 | -14/+35 |
| |\| | |||||
| | * | fix mime-type icons in /cloud | Mario Vavti | 2016-05-01 | 1 | -1/+1 |
| | | | |||||
| | * | tweak dl bbcode in expanded autocomplete a bit more | Mario Vavti | 2016-05-01 | 1 | -3/+4 |
| | | | |||||
| | * | Merge pull request #363 from Treer/bbcode | git-marijus | 2016-05-01 | 1 | -6/+9 |
| | |\ | | | | | | | tweak dl bbcode in expanded autocomplete | ||||
| | | * | tweak dl bbcode in expanded autocomplete | Treer | 2016-05-01 | 1 | -6/+9 |
| | | | | |||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-05-01 | 1 | -2/+0 |
| | |\ \ | |||||
| | | * | | css fix | Mario Vavti | 2016-05-01 | 1 | -2/+0 |
| | | |/ | |||||
| | * / | make weblink and attach button hideable and some minor fixes | Mario Vavti | 2016-05-01 | 4 | -5/+24 |
| | |/ | |||||
| * / | some much needed work on oembed security | redmatrix | 2016-05-01 | 8 | -68/+255 |
| |/ | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-30 | 541 | -25213/+29542 |
| |\ | |||||
| | * | Merge pull request #362 from Treer/fontawesome | redmatrix | 2016-05-01 | 512 | -22656/+27156 |
| | |\ | | | | | | | Update Font-Awesome to 4.6.1 | ||||
| | | * | update icon names in library | Treer | 2016-05-01 | 2 | -8/+8 |
| | | | | |||||
| | | * | update icon names in view/ | Treer | 2016-05-01 | 85 | -349/+349 |
| | | | | |||||
| | | * | update icon names in view/js | Treer | 2016-05-01 | 7 | -68/+68 |
| | | | | |||||
| | | * | update icon names in include/ | Treer | 2016-05-01 | 6 | -34/+34 |
| | | | | |||||
| | | * | update icon names in Zotlabs/ | Treer | 2016-05-01 | 3 | -5/+5 |
| | | | | |||||
| | | * | update font-awesome library to 4.6.1 | Treer | 2016-04-30 | 409 | -22192/+26692 |
| | | | | | | | | | | | | | Perhaps this should be done as a submodule instead? | ||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-04-30 | 2 | -6/+7 |
| | |\ \ | |||||
| | | * \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | jeroenpraat | 2016-04-30 | 10 | -463/+333 |
| | | |\ \ | |||||
| | | * | | | Small fix of Dutch strings | jeroenpraat | 2016-04-30 | 2 | -6/+7 |
| | | | | | | |||||
| | * | | | | css fix | Mario Vavti | 2016-04-30 | 3 | -15/+5 |
| | | |/ / | |/| | | |||||
| | * | | | whitespace | Mario Vavti | 2016-04-30 | 1 | -36/+35 |
| | | | | | |||||
| | * | | | more work on layout editors | Mario Vavti | 2016-04-30 | 2 | -5/+7 |
| | | | | | |||||
| | * | | | make mod editlayout use status_editor() | Mario Vavti | 2016-04-30 | 2 | -108/+55 |
| | | | | | |||||
| | * | | | add dl bbcode to the expanded autocomplete | Mario Vavti | 2016-04-30 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | minor cleanup | Mario Vavti | 2016-04-30 | 1 | -24/+16 |
| | | | | | |||||
| | * | | | Merge pull request #361 from Treer/bbcode | git-marijus | 2016-04-30 | 6 | -291/+221 |
| | |\ \ \ | | |/ / | |/| | | Add definition lists to bbcode | ||||
| | | * | | clean up some doc/ formatting | Treer | 2016-04-30 | 2 | -288/+128 |
| | | | | | |||||
| | | * | | improve whitespace control around definition list ([dl]) bbcode | Treer | 2016-04-30 | 1 | -4/+6 |
| | | | | | |||||
| | | * | | Add definition lists to bbcode | Treer | 2016-04-30 | 4 | -3/+91 |
| | | | | | |||||
| | * | | | Update NL+ES-ES | jeroenpraat | 2016-04-30 | 4 | -1916/+1888 |
| | | |/ | |/| | |||||
| | * | | get rid of the unused ispublic variable | Mario Vavti | 2016-04-29 | 9 | -27/+4 |
| | | | | |||||
| | * | | css fix | Mario Vavti | 2016-04-29 | 1 | -1/+2 |
| | | | | |||||
| | * | | Merge pull request #360 from sasiflo/dev_sasiflo_contexthelp | git-marijus | 2016-04-29 | 13 | -0/+96 |
| | |\ \ | | | | | | | | | context help: added german translation | ||||
| | | * \ | Merge branch 'dev' into dev_sasiflo_contexthelp | sasiflo | 2016-04-29 | 1 | -25/+0 |
| | | |\ \ | |||||
| | | * | | | Added german translation to context help. | sasiflo | 2016-04-29 | 13 | -0/+96 |
| | | | | | | |||||
| | * | | | | some work on making mod editpost use status_editor() - if you find anything ↵ | Mario Vavti | 2016-04-29 | 4 | -109/+60 |
| | | | | | | | | | | | | | | | | | | | | | related to jot broken please revert this commit | ||||
| | * | | | | css fixes | Mario Vavti | 2016-04-29 | 1 | -5/+1 |
| | | |/ / | |/| | | |||||
| | * | | | jot: cleanup unused variables | Mario Vavti | 2016-04-29 | 1 | -25/+0 |
| | |/ / | |||||
| * | | | Merge branch 'master' into dev | redmatrix | 2016-04-29 | 2 | -794/+779 |
| |\ \ \ | |||||
| | * | | | version+strings | redmatrix | 2016-04-29 | 2 | -794/+779 |
| | | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |