Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-03 | 7 | -8/+38 |
|\ | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-03 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge pull request #365 from Treer/fontawesome | git-marijus | 2016-05-03 | 1 | -1/+1 |
| | |\ | | | | | | | | | another font-awesome icon | ||||
| | | * | another font-awesome icon | Treer | 2016-05-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | some preliminary structural work for app organisation | redmatrix | 2016-05-03 | 6 | -7/+37 |
| |/ / | |||||
* | | | Increased PHPGit timeout to 120 seconds for large repos. Retrieve Readme.md ↵ | Andrew Manning | 2016-05-03 | 4 | -12/+33 |
| | | | | | | | | | | | | and render on plugins page. | ||||
* | | | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-03 | 34 | -101/+726 |
|\| | | |||||
| * | | add the new hook | redmatrix | 2016-05-02 | 1 | -0/+3 |
| | | | |||||
| * | | more security stuff | redmatrix | 2016-05-02 | 4 | -71/+52 |
| | | | |||||
| * | | 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 |
| |\| | | |||||
| * | | | some much needed work on oembed security | redmatrix | 2016-05-01 | 8 | -68/+255 |
| | | | | |||||
* | | | | AJAX and spinner for add repo form submission. Repo info will be displayed ↵ | Andrew Manning | 2016-05-03 | 3 | -12/+39 |
| | | | | | | | | | | | | | | | | below the form. | ||||
* | | | | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-01 | 6 | -12/+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 |
| |\ \ \ | |||||
| * | | | | make weblink and attach button hideable and some minor fixes | Mario Vavti | 2016-05-01 | 4 | -5/+24 |
| | |/ / | |/| | | |||||
* | | | | New plugin repo is cloned to /store/pluginrepos/REPONAME for analysis | Andrew Manning | 2016-05-01 | 126 | -15/+18177 |
| | | | | |||||
* | | | | fixed tpl | Andrew Manning | 2016-05-01 | 1 | -1/+1 |
| | | | | |||||
* | | | | Create form on admin/plugins page to add plugin git repo using PHPGit | Andrew Manning | 2016-05-01 | 3 | -5/+36 |
| |/ / |/| | | |||||
* | | | css fix | Mario Vavti | 2016-05-01 | 1 | -2/+0 |
|/ / | |||||
* | | 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 |