Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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 | |
| |/ / | ||||||
| * | | whitespace | Mario Vavti | 2016-05-04 | 1 | -3/+3 | |
| | | | ||||||
| * | | whitespace | Mario Vavti | 2016-05-04 | 1 | -40/+34 | |
|/ / | ||||||
* | | 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 remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-03 | 7 | -8/+38 | |
| |\ | |/ |/| | ||||||
* | | 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 | |
|/ / / | ||||||
| | * | Increased PHPGit timeout to 120 seconds for large repos. Retrieve Readme.md ↵ | Andrew Manning | 2016-05-03 | 4 | -12/+33 | |
| | | | | | | | | | | | | and render on plugins page. | |||||
| | * | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-03 | 34 | -101/+726 | |
| | |\ | |_|/ |/| | | ||||||
* | | | 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 | |
| | | | | ||||||
* | | | | 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 | 7 | -20/+13 | |
| | | | | ||||||
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-01 | 7 | -14/+35 | |
|\| | | | ||||||
* | | | | some much needed work on oembed security | redmatrix | 2016-05-01 | 8 | -68/+255 | |
| | | | | ||||||
| | | * | AJAX and spinner for add repo form submission. Repo info will be displayed ↵ | Andrew Manning | 2016-05-03 | 3 | -12/+39 | |
| | | | | | | | | | | | | | | | | below the form. | |||||
| | | * | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-01 | 6 | -12/+35 | |
| | | |\ | | |_|/ | |/| | | ||||||
| * | | | fix mime-type icons in /cloud | Mario Vavti | 2016-05-01 | 1 | -1/+1 | |
| | | | |