| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-09 | 30 | -357/+425 |
| |\ | |||||
| | * | Merge pull request #371 from Treer/permissions | redmatrix | 2016-05-10 | 3 | -11/+20 |
| | |\ | | | | | | | minor cleanup. No functional changes | ||||
| | | * | minor cleanup. No functional changes | Treer | 2016-05-10 | 3 | -11/+20 |
| | |/ | |||||
| | * | if we do not have a layout $layout should be empty not default | Mario Vavti | 2016-05-09 | 1 | -1/+1 |
| | | | |||||
| | * | remove unused code and whitespace | Mario Vavti | 2016-05-09 | 2 | -11/+1 |
| | | | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-05-09 | 4 | -13/+26 |
| | |\ | |||||
| | | * | prevent recursion in the database driver when debugging is enabled and the ↵ | redmatrix | 2016-05-09 | 4 | -13/+26 |
| | | | | | | | | | | | | | 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 | 4 | -139/+91 |
| | | | | | | | | | | | | | creation | ||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-05-09 | 23 | -110/+260 |
| | |\| | |||||
| | | * | remove the old IE html5 hack. | redmatrix | 2016-05-08 | 1 | -4/+0 |
| | | | | |||||
| | | * | clean up some cruft | redmatrix | 2016-05-08 | 3 | -52/+6 |
| | | | | |||||
| | | * | convert media embed functions that deal with rewriting specific corporate ↵ | redmatrix | 2016-05-08 | 2 | -24/+13 |
| | | | | | | | | | | | | | services to addon hooks | ||||
| | | * | Merge pull request #370 from Treer/permissions | redmatrix | 2016-05-09 | 14 | -25/+236 |
| | | |\ | | | | | | | | | ACL dialogs: Make the non-ACL-option description more accurate | ||||
| | | | * | Update some modules to use new ACL dialog feature | Treer | 2016-05-08 | 9 | -11/+24 |
| | | | | | |||||
| | | | * | improve non-ACL option description in ACL dialog | Treer | 2016-05-08 | 5 | -14/+212 |
| | | |/ | |||||
| | * | | make editblock use status_editor() | Mario Vavti | 2016-05-07 | 4 | -90/+44 |
| | | | | |||||
| * | | | Fixed some bugs with empty repo name and improved the interface a bit. | Andrew Manning | 2016-05-09 | 3 | -53/+52 |
| | | | | |||||
| * | | | copy-paste error | Andrew Manning | 2016-05-09 | 3 | -10/+47 |
| | | | | |||||
| * | | | Addon repo is copied to /extend/addon/ when admin presses install. Addon ↵ | Andrew Manning | 2016-05-08 | 2 | -7/+110 |
| | | | | | | | | | | | | | repos can be removed via GUI. | ||||
| * | | | Custom addon repo name option added. | Andrew Manning | 2016-05-08 | 4 | -21/+72 |
| | | | | |||||
| * | | | Existing addon repos are listed on plugin page with controls for updating, ↵ | Andrew Manning | 2016-05-07 | 2 | -4/+61 |
| | | | | | | | | | | | | | 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 | 5 | -160/+170 |
| | | | | | | | | | | | | | wide modal dialog. | ||||
| * | | | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-07 | 2 | -2/+2 |
| |\| | | |||||
| | * | | Merge pull request #369 from Treer/fontawesome | git-marijus | 2016-05-06 | 2 | -2/+2 |
| | |\ \ | | |/ | |/| | update two Font Awesome icons | ||||
| | | * | update 2 fontawesome icons | Treer | 2016-05-06 | 2 | -2/+2 |
| | |/ | |||||
| * | | Progress implementing GitRepo class in Zotlabs/Storage | Andrew Manning | 2016-05-07 | 1 | -9/+96 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into plugin-repo | Andrew Manning | 2016-05-06 | 9 | -1994/+1999 |
| |\| | |||||
| | * | use section-content-info-wrapper class for info text | Mario Vavti | 2016-05-06 | 2 | -11/+2 |
| | | | |||||
| | * | use darker background colour only for searchbar | Mario Vavti | 2016-05-06 | 2 | -11/+24 |
| | | | |||||
| | * | missed one other place where we called comanche outside the page build | redmatrix | 2016-05-06 | 2 | -1542/+1514 |
| | | | |||||
| | * | objectify comanche | redmatrix | 2016-05-05 | 5 | -434/+459 |
| | | | |||||
| | * | comments | redmatrix | 2016-05-05 | 1 | -0/+4 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-05 | 7 | -26/+82 |
| |\| | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-05 | 5 | -25/+41 |
| | |\ | |||||
| | | * | Merge pull request #368 from Treer/permissions | redmatrix | 2016-05-06 | 5 | -25/+41 |
| | | |\ | | | | | | | | | Unify permissions dialog for network posts, channel posts, and remote posts | ||||
| | | | * | Unify permissions dialog for network posts, channel posts, and remote posts | Treer | 2016-05-06 | 5 | -25/+41 |
| | | |/ | | | | | | | | | | | | | | | | * 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 | 2 | -1/+41 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 | 13 | -87/+346 |
| |\| | |||||
| | * | replace app tagcloud with more traditional categories widget. One can always ↵ | redmatrix | 2016-05-05 | 3 | -1/+45 |
| | | | | | | | | | change this in the PDL | ||||
| | * | 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 | 2 | -85/+48 |
| | | | |||||
| | * | provide a tag cloud for app categories and allow filtering apps from this | redmatrix | 2016-05-04 | 6 | -3/+98 |
| | | | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-04 | 8 | -65/+204 |
| | |\ | |||||
| | * | | add categories to apps (wip) | redmatrix | 2016-05-04 | 5 | -33/+187 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-04 | 19 | -92/+296 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Merge pull request #366 from Treer/permissions | redmatrix | 2016-05-05 | 7 | -25/+170 |
| | |\ \ | | | | | | | | | Refining the Permission settings dialog | ||||
| | | * | | add help to some permissions dialogs | Treer | 2016-05-05 | 6 | -7/+32 |
| | | | | | |||||
| | | * | | Refine permissions dialog UI | Treer | 2016-05-04 | 6 | -25/+145 |
| | |/ / | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |