Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-05 | 4 | -19/+8 |
|\ | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-05 | 3 | -19/+3 |
| |\ | |||||
| | * | Unify permissions dialog for network posts, channel posts, and remote posts | Treer | 2016-05-06 | 3 | -19/+3 |
| | | | | | | | | | | | | | | | | | | * changes the warning from being about when a post is "sent" to when it's "shared", to match the Share button. * hyperlinks the "cannot be changed" part of the warning to the help file * adds some more content to the help file | ||||
| * | | - Setup: check php version (5.4 required) | redmatrix | 2016-05-05 | 1 | -0/+5 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Comanche: implement conditionals. Currently the only supported tests are true/false for system config settings and supports the following forms: [if $config.system.foo] [widget=widget1][/widget] [else] [widget=widget2][/widget] [/if] [if $config.system.foo] [widget=widget1][/widget] [/if] | ||||
* | | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-05 | 4 | -6/+72 |
|\| | |||||
| * | Allow follow to work with a pasted webbie from the profile page (where we've ↵ | redmatrix | 2016-05-04 | 1 | -1/+4 |
| | | | | | | | | replaced the '@' sign with a UTF-8 look-alike) | ||||
| * | isolate all the tagadelic core code into a class and reuse it | redmatrix | 2016-05-04 | 1 | -0/+44 |
| | | |||||
| * | provide a tag cloud for app categories and allow filtering apps from this | redmatrix | 2016-05-04 | 1 | -1/+2 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-04 | 3 | -43/+53 |
| |\ | |||||
| * | | add categories to apps (wip) | redmatrix | 2016-05-04 | 1 | -4/+22 |
| | | | |||||
* | | | 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 | 4 | -34/+58 |
|\| | |||||
| * | 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 | 2 | -15/+10 |
| | | |||||
| * | 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 | 2 | -1/+76 |
| | | |||||
* | | 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 | 3 | -5/+5 |
|\ | | | | | Update Font-Awesome to 4.6.1 | ||||
| * | update icon names in Zotlabs/ | Treer | 2016-05-01 | 3 | -5/+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 | 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 | 6 | -11/+11 |
| | |||||
* | This setting isn't implemented so remove the UI until it is. | redmatrix | 2016-04-28 | 1 | -1/+1 |
| | |||||
* | provide a Hook method to unregister all hooks with a given filespec ↵ | redmatrix | 2016-04-27 | 1 | -0/+21 |
| | | | | component. This will be useful in upgrading plugins to use new interfaces, as you won't have to individually unregister hook declarations that you are no longer using in the code. | ||||
* | 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 |
| | |||||
* | Class method support for hooks | redmatrix | 2016-04-23 | 1 | -0/+10 |
| | |||||
* | 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 branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-21 | 1 | -1/+5 |
|\ | |||||
| * | Merge pull request #351 from anaqreon/toggle-context-help | git-marijus | 2016-04-21 | 1 | -1/+5 |
| |\ | | | | | | | Toggle context help |