Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |/ | |||||
| * | SDAV is already absolute | redmatrix | 2016-05-07 | 1 | -3/+3 |
| | | |||||
| * | 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 |
| |/ | |||||
* / | make editblock use status_editor() | Mario Vavti | 2016-05-07 | 4 | -90/+44 |
|/ | |||||
* | 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 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] | ||||
* | 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 |
|\ | |||||
| * | 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 |
| |/ | |||||
| * | whitespace | Mario Vavti | 2016-05-04 | 1 | -3/+3 |
| | | |||||
| * | whitespace | Mario Vavti | 2016-05-04 | 1 | -40/+34 |
| | | |||||
* | | add categories to apps (wip) | redmatrix | 2016-05-04 | 5 | -33/+187 |
|/ | |||||
* | Sync the current list of system apps with the built-in name translation ↵ | redmatrix | 2016-05-03 | 6 | -8/+13 |
| | | | | table. Some of the names were changed in the past without the translation table being updated to reflect it. | ||||
* | ensure that important system fields are passed through the appman editor | redmatrix | 2016-05-03 | 2 | -1/+9 |
| | |||||
* | more background work for app management - give every member a copy of all ↵ | redmatrix | 2016-05-03 | 4 | -18/+70 |
| | | | | 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 branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 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 |
| | | | |||||
* | | | some preliminary structural work for app organisation | redmatrix | 2016-05-03 | 6 | -7/+37 |
|/ / | |||||
* | | add the new hook | redmatrix | 2016-05-02 | 1 | -0/+3 |
| | | |||||
* | | more security stuff | redmatrix | 2016-05-02 | 4 | -71/+52 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-02 | 13 | -0/+395 |
|\ \ | |||||
| * \ | Merge pull request #364 from mjfriaza/dev | redmatrix | 2016-05-03 | 13 | -0/+395 |
| |\ \ | | | | | | | | | Contextual help in Spanish | ||||
| | * | | Contextual help in Spanish | Manuel Jiménez Friaza | 2016-05-02 | 13 | -0/+395 |
| | | | | |||||
* | | | | a bit more oembed security - and document the shortcomings of this approach | redmatrix | 2016-05-02 | 1 | -16/+20 |
|/ / / | |||||
* | | | sort out the rest of the source categories | redmatrix | 2016-05-02 | 2 | -4/+4 |
| | | | |||||
* | | | a couple of bugfixes from earlier checkins and implementation of source tags | redmatrix | 2016-05-01 | 5 | -7/+50 |
| | | | |||||
* | | | db schema change to add tags to content sources | redmatrix | 2016-05-01 | 4 | -3/+14 |
| | | |