Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-05 | 3 | -1/+3 |
|\ | |||||
| * | replace app tagcloud with more traditional categories widget. One can always ↵ | redmatrix | 2016-05-05 | 1 | -1/+1 |
| | | | | | | | | change this in the PDL | ||||
| * | provide a tag cloud for app categories and allow filtering apps from this | redmatrix | 2016-05-04 | 2 | -1/+2 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-04 | 3 | -17/+116 |
| |\ | |||||
| * | | add categories to apps (wip) | redmatrix | 2016-05-04 | 1 | -0/+1 |
| | | | |||||
* | | | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-04 | 5 | -19/+122 |
|\ \ \ | | |/ | |/| | |||||
| * | | add help to some permissions dialogs | Treer | 2016-05-05 | 2 | -2/+14 |
| | | | |||||
| * | | Refine permissions dialog UI | Treer | 2016-05-04 | 3 | -17/+104 |
| |/ | |||||
| * | ensure that important system fields are passed through the appman editor | redmatrix | 2016-05-03 | 1 | -0/+4 |
| | | |||||
| * | more background work for app management - give every member a copy of all ↵ | redmatrix | 2016-05-03 | 1 | -2/+2 |
| | | | | | | | | the system apps so that they can edit and delete them to taste/preference. This needs further work to pick up changes in system apps (additions, edits, deletions, etc.). Currently this is done once and never attempted again. | ||||
* | | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 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 |
| | | | |||||
* | | | Increased PHPGit timeout to 120 seconds for large repos. Retrieve Readme.md ↵ | Andrew Manning | 2016-05-03 | 1 | -1/+10 |
| | | | | | | | | | | | | and render on plugins page. | ||||
* | | | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-03 | 4 | -1/+13 |
|\| | | |||||
| * | | more security stuff | redmatrix | 2016-05-02 | 1 | -13/+3 |
| | | | |||||
| * | | a couple of bugfixes from earlier checkins and implementation of source tags | redmatrix | 2016-05-01 | 2 | -0/+2 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-01 | 4 | -10/+18 |
| |\ \ | |||||
| * | | | some much needed work on oembed security | redmatrix | 2016-05-01 | 2 | -0/+20 |
| | | | | |||||
* | | | | AJAX and spinner for add repo form submission. Repo info will be displayed ↵ | Andrew Manning | 2016-05-03 | 2 | -2/+26 |
| | | | | | | | | | | | | | | | | below the form. | ||||
* | | | | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-01 | 3 | -8/+18 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | 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 | 1 | -1/+7 |
| | |/ / | |/| | | |||||
* | | | | New plugin repo is cloned to /store/pluginrepos/REPONAME for analysis | Andrew Manning | 2016-05-01 | 1 | -14/+15 |
| | | | | |||||
* | | | | Create form on admin/plugins page to add plugin git repo using PHPGit | Andrew Manning | 2016-05-01 | 2 | -4/+23 |
| |/ / |/| | | |||||
* | | | css fix | Mario Vavti | 2016-05-01 | 1 | -2/+0 |
|/ / | |||||
* | | Merge pull request #362 from Treer/fontawesome | redmatrix | 2016-05-01 | 93 | -418/+418 |
|\| | | | | | Update Font-Awesome to 4.6.1 | ||||
| * | 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 | 1 | -1/+1 |
| | | |||||
* | | 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 | 2 | -3/+24 |
| |\ \ | |||||
| * | | | Small fix of Dutch strings | jeroenpraat | 2016-04-30 | 2 | -6/+7 |
| | | | | |||||
* | | | | css fix | Mario Vavti | 2016-04-30 | 3 | -15/+5 |
| |/ / |/| | | |||||
* | | | add dl bbcode to the expanded autocomplete | Mario Vavti | 2016-04-30 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #361 from Treer/bbcode | git-marijus | 2016-04-30 | 2 | -1/+22 |
|\ \ \ | |/ / |/| | | Add definition lists to bbcode | ||||
| * | | Add definition lists to bbcode | Treer | 2016-04-30 | 2 | -1/+22 |
| | | | |||||
* | | | Update NL+ES-ES | jeroenpraat | 2016-04-30 | 4 | -1916/+1888 |
| |/ |/| | |||||
* | | get rid of the unused ispublic variable | Mario Vavti | 2016-04-29 | 5 | -23/+2 |
| | | |||||
* | | css fix | Mario Vavti | 2016-04-29 | 1 | -1/+2 |
| | | |||||
* | | some work on making mod editpost use status_editor() - if you find anything ↵ | Mario Vavti | 2016-04-29 | 2 | -6/+6 |
| | | | | | | | | related to jot broken please revert this commit | ||||
* | | css fixes | Mario Vavti | 2016-04-29 | 1 | -5/+1 |
| | | |||||
* | | This setting isn't implemented so remove the UI until it is. | redmatrix | 2016-04-28 | 1 | -3/+0 |
|/ | |||||
* | provide help button in context help popup | Mario Vavti | 2016-04-28 | 2 | -5/+22 |
| | |||||
* | css fix | Mario Vavti | 2016-04-28 | 1 | -0/+1 |
| | |||||
* | some refinements on jot | Mario Vavti | 2016-04-27 | 2 | -14/+21 |
| |