aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* objectify comancheredmatrix2016-05-055-434/+459
|
* commentsredmatrix2016-05-051-0/+4
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-055-25/+41
|\
| * Merge pull request #368 from Treer/permissionsredmatrix2016-05-065-25/+41
| |\ | | | | | | Unify permissions dialog for network posts, channel posts, and remote posts
| | * Unify permissions dialog for network posts, channel posts, and remote postsTreer2016-05-065-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)redmatrix2016-05-052-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 ↵redmatrix2016-05-053-1/+45
| | | | change this in the PDL
* Allow follow to work with a pasted webbie from the profile page (where we've ↵redmatrix2016-05-041-1/+4
| | | | replaced the '@' sign with a UTF-8 look-alike)
* isolate all the tagadelic core code into a class and reuse itredmatrix2016-05-042-85/+48
|
* provide a tag cloud for app categories and allow filtering apps from thisredmatrix2016-05-046-3/+98
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-048-65/+204
|\
| * Merge pull request #366 from Treer/permissionsredmatrix2016-05-057-25/+170
| |\ | | | | | | Refining the Permission settings dialog
| | * add help to some permissions dialogsTreer2016-05-056-7/+32
| | |
| | * Refine permissions dialog UITreer2016-05-046-25/+145
| |/
| * whitespaceMario Vavti2016-05-041-3/+3
| |
| * whitespaceMario Vavti2016-05-041-40/+34
| |
* | add categories to apps (wip)redmatrix2016-05-045-33/+187
|/
* Sync the current list of system apps with the built-in name translation ↵redmatrix2016-05-036-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 editorredmatrix2016-05-032-1/+9
|
* more background work for app management - give every member a copy of all ↵redmatrix2016-05-034-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_mergeredmatrix2016-05-031-1/+1
|\
| * Merge pull request #365 from Treer/fontawesomegit-marijus2016-05-031-1/+1
| |\ | | | | | | another font-awesome icon
| | * another font-awesome iconTreer2016-05-041-1/+1
| | |
* | | some preliminary structural work for app organisationredmatrix2016-05-036-7/+37
|/ /
* | add the new hookredmatrix2016-05-021-0/+3
| |
* | more security stuffredmatrix2016-05-024-71/+52
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-0213-0/+395
|\ \
| * \ Merge pull request #364 from mjfriaza/devredmatrix2016-05-0313-0/+395
| |\ \ | | | | | | | | Contextual help in Spanish
| | * | Contextual help in SpanishManuel Jiménez Friaza2016-05-0213-0/+395
| | | |
* | | | a bit more oembed security - and document the shortcomings of this approachredmatrix2016-05-021-16/+20
|/ / /
* | | sort out the rest of the source categoriesredmatrix2016-05-022-4/+4
| | |
* | | a couple of bugfixes from earlier checkins and implementation of source tagsredmatrix2016-05-015-7/+50
| | |
* | | db schema change to add tags to content sourcesredmatrix2016-05-014-3/+14
| | |
* | | sort addons based on the internal display name instead of the filenameredmatrix2016-05-011-0/+7
| | |
* | | use only the std_versionredmatrix2016-05-017-20/+13
| | |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-017-14/+35
|\| |
| * | fix mime-type icons in /cloudMario Vavti2016-05-011-1/+1
| | |
| * | tweak dl bbcode in expanded autocomplete a bit moreMario Vavti2016-05-011-3/+4
| | |
| * | Merge pull request #363 from Treer/bbcodegit-marijus2016-05-011-6/+9
| |\ \ | | | | | | | | tweak dl bbcode in expanded autocomplete
| | * | tweak dl bbcode in expanded autocompleteTreer2016-05-011-6/+9
| | | |
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-05-011-2/+0
| |\ \ \
| | * | | css fixMario Vavti2016-05-011-2/+0
| | |/ /
| * / / make weblink and attach button hideable and some minor fixesMario Vavti2016-05-014-5/+24
| |/ /
* / / some much needed work on oembed securityredmatrix2016-05-018-68/+255
|/ /
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-30541-25213/+29542
|\ \
| * | Merge pull request #362 from Treer/fontawesomeredmatrix2016-05-01512-22656/+27156
| |\| | | | | | | Update Font-Awesome to 4.6.1
| | * update icon names in libraryTreer2016-05-012-8/+8
| | |
| | * update icon names in view/Treer2016-05-0185-349/+349
| | |
| | * update icon names in view/jsTreer2016-05-017-68/+68
| | |
| | * update icon names in include/Treer2016-05-016-34/+34
| | |