Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-04 | 5 | -45/+64 |
|\ | |||||
| * | add help to some permissions dialogs | Treer | 2016-05-05 | 2 | -2/+2 |
| | | |||||
| * | Refine permissions dialog UI | Treer | 2016-05-04 | 2 | -3/+19 |
| | | |||||
| * | whitespace | Mario Vavti | 2016-05-04 | 1 | -3/+3 |
| | | |||||
| * | whitespace | Mario Vavti | 2016-05-04 | 1 | -40/+34 |
| | | |||||
| * | ensure that important system fields are passed through the appman editor | redmatrix | 2016-05-03 | 1 | -1/+5 |
| | | |||||
| * | more background work for app management - give every member a copy of all ↵ | redmatrix | 2016-05-03 | 1 | -1/+6 |
| | | | | | | | | 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. | ||||
* | | Increased PHPGit timeout to 120 seconds for large repos. Retrieve Readme.md ↵ | Andrew Manning | 2016-05-03 | 1 | -9/+21 |
| | | | | | | | | and render on plugins page. | ||||
* | | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-03 | 3 | -20/+49 |
|\| | |||||
| * | more security stuff | redmatrix | 2016-05-02 | 1 | -8/+13 |
| | | |||||
| * | sort out the rest of the source categories | redmatrix | 2016-05-02 | 1 | -2/+2 |
| | | |||||
| * | a couple of bugfixes from earlier checkins and implementation of source tags | redmatrix | 2016-05-01 | 1 | -6/+13 |
| | | |||||
| * | 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 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-01 | 2 | -2/+7 |
| |\ | |||||
| * | | some much needed work on oembed security | redmatrix | 2016-05-01 | 2 | -11/+20 |
| | | | |||||
* | | | AJAX and spinner for add repo form submission. Repo info will be displayed ↵ | Andrew Manning | 2016-05-03 | 1 | -10/+13 |
| | | | | | | | | | | | | below the form. | ||||
* | | | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-01 | 2 | -2/+7 |
|\ \ \ | | |/ | |/| | |||||
| * | | make weblink and attach button hideable and some minor fixes | Mario Vavti | 2016-05-01 | 2 | -2/+7 |
| |/ | |||||
* | | New plugin repo is cloned to /store/pluginrepos/REPONAME for analysis | Andrew Manning | 2016-05-01 | 1 | -1/+57 |
| | | |||||
* | | 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 | 1 | -1/+13 |
|/ | |||||
* | Merge pull request #362 from Treer/fontawesome | redmatrix | 2016-05-01 | 2 | -4/+4 |
|\ | | | | | Update Font-Awesome to 4.6.1 | ||||
| * | update icon names in Zotlabs/ | Treer | 2016-05-01 | 2 | -4/+4 |
| | | |||||
* | | 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 | 1 | -107/+54 |
| | | |||||
* | | minor cleanup | Mario Vavti | 2016-04-30 | 1 | -24/+16 |
|/ | |||||
* | get rid of the unused ispublic variable | Mario Vavti | 2016-04-29 | 3 | -3/+2 |
| | |||||
* | some work on making mod editpost use status_editor() - if you find anything ↵ | Mario Vavti | 2016-04-29 | 1 | -87/+28 |
| | | | | related to jot broken please revert this commit | ||||
* | allow engineering units (e.g. 400M, 1G) as service class limits | redmatrix | 2016-04-28 | 2 | -3/+3 |
| | |||||
* | This setting isn't implemented so remove the UI until it is. | redmatrix | 2016-04-28 | 1 | -1/+1 |
| | |||||
* | some refinements on jot | Mario Vavti | 2016-04-27 | 2 | -23/+9 |
| | |||||
* | make it more obvious what is behind the dropdowns | Mario Vavti | 2016-04-25 | 3 | -2/+5 |
| | |||||
* | Some issues discovered with linkinfo module, and update the doco about using ↵ | redmatrix | 2016-04-21 | 1 | -20/+20 |
| | | | | 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 | 1 | -21/+9 |
| | | | | idea it was even here. | ||||
* | Merge pull request #351 from anaqreon/toggle-context-help | git-marijus | 2016-04-21 | 1 | -1/+5 |
|\ | | | | | Toggle context help | ||||
| * | Added admin/site setting that toggles context help panel. If disabled, ↵ | Andrew Manning | 2016-04-21 | 1 | -1/+2 |
| | | | | | | | | original help menu button behavior is restored. | ||||
| * | Merge branch 'dev' into toggle-context-help | Andrew Manning | 2016-04-20 | 157 | -0/+27074 |
| |\ | |||||
| * | | Try toggling context help using onclick attribute | Andrew Manning | 2016-04-19 | 1 | -1/+4 |
| | | | |||||
* | | | revert the reversal of checkjs logic, but still restrict the behaviour scope ↵ | redmatrix | 2016-04-20 | 3 | -6/+6 |
| | | | | | | | | | | | | to just those urls that require it | ||||
* | | | We no longer require the diaspora_meta service locally. | redmatrix | 2016-04-20 | 1 | -3/+3 |
| |/ |/| | |||||
* | | missing class instance pointer in Pconfig module upgrade | redmatrix | 2016-04-19 | 1 | -1/+1 |
| | | |||||
* | | remove test files which were committed by accident | redmatrix | 2016-04-19 | 3 | -164/+0 |
| | | |||||
* | | a bit more namespace wrangling | redmatrix | 2016-04-18 | 5 | -9/+9 |
| | | |||||
* | | module updates | redmatrix | 2016-04-18 | 156 | -0/+26987 |
| | | |||||
* | | convert all the _well_known service controllers which are a bit touchy when ↵ | redmatrix | 2016-04-18 | 4 | -0/+251 |
|/ | | | | it comes to the router | ||||
* | pull in the new object router and a few selected samples for the new ↵ | redmatrix | 2016-04-17 | 2 | -0/+1903 |
| | | | | controller layout | ||||
* | Convert Channel to new module | redmatrix | 2016-04-15 | 2 | -0/+434 |