Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-10 | 1 | -2/+2 |
|\ | |||||
| * | allow delayed publishing of webpages | Mario Vavti | 2016-05-10 | 1 | -2/+2 |
| | | |||||
* | | try again with shutdown handler, fix issue #373 (live-pubstream div wasn't ↵ | redmatrix | 2016-05-10 | 2 | -3/+3 |
|/ | | | | present | ||||
* | revert shutdown function | redmatrix | 2016-05-09 | 1 | -1/+3 |
| | |||||
* | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-09 | 12 | -222/+135 |
|\ | |||||
| * | minor cleanup. No functional changes | Treer | 2016-05-10 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-05-09 | 1 | -2/+2 |
| |\ | |||||
| | * | prevent recursion in the database driver when debugging is enabled and the ↵ | redmatrix | 2016-05-09 | 1 | -2/+2 |
| | | | | | | | | | | | | system config is not yet loaded - caused by calling get_config and making db calls within the logger function; which we then attempt to log... | ||||
| * | | make editwebpage use status_editor() and fix storing of layout on webpage ↵ | Mario Vavti | 2016-05-09 | 2 | -135/+78 |
| | | | | | | | | | | | | creation | ||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-05-09 | 10 | -14/+27 |
| |\| | |||||
| | * | Update some modules to use new ACL dialog feature | Treer | 2016-05-08 | 9 | -11/+24 |
| | | | |||||
| * | | make editblock use status_editor() | Mario Vavti | 2016-05-07 | 3 | -76/+33 |
| | | | |||||
* | | | Fixed some bugs with empty repo name and improved the interface a bit. | Andrew Manning | 2016-05-09 | 1 | -7/+10 |
| | | | |||||
* | | | copy-paste error | Andrew Manning | 2016-05-09 | 1 | -0/+20 |
| | | | |||||
* | | | Addon repo is copied to /extend/addon/ when admin presses install. Addon ↵ | Andrew Manning | 2016-05-08 | 1 | -1/+61 |
| | | | | | | | | | | | | repos can be removed via GUI. | ||||
* | | | Custom addon repo name option added. | Andrew Manning | 2016-05-08 | 1 | -4/+30 |
| | | | |||||
* | | | Existing addon repos are listed on plugin page with controls for updating, ↵ | Andrew Manning | 2016-05-07 | 1 | -3/+28 |
| | | | | | | | | | | | | removing, and switching branches. | ||||
* | | | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-07 | 1 | -3/+3 |
|\ \ \ | | |/ | |/| | |||||
| * | | SDAV is already absolute | redmatrix | 2016-05-07 | 1 | -3/+3 |
| |/ | |||||
* | | New plugin repo cloned using new GitRepo class. Readme and info displayed in ↵ | Andrew Manning | 2016-05-07 | 1 | -43/+20 |
| | | | | | | | | wide modal dialog. | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into plugin-repo | Andrew Manning | 2016-05-06 | 1 | -5/+5 |
|\| | |||||
| * | objectify comanche | redmatrix | 2016-05-05 | 1 | -5/+5 |
| | | |||||
* | | 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 | 3 | -6/+28 |
|\| | |||||
| * | 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) | ||||
| * | 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 | 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 |
| |/ |