aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* more work on diaspora relayredmatrix2016-05-091-0/+5
|
* minor cleanup. No functional changesTreer2016-05-101-4/+15
|
* if we do not have a layout $layout should be empty not defaultMario Vavti2016-05-091-1/+1
|
* remove unused code and whitespaceMario Vavti2016-05-091-10/+0
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-05-093-11/+24
|\
| * prevent recursion in the database driver when debugging is enabled and the ↵redmatrix2016-05-093-11/+24
| | | | | | | | 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 Vavti2016-05-092-4/+13
| | | | | | | | creation
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-05-094-73/+196
|\|
| * clean up some cruftredmatrix2016-05-081-46/+0
| |
| * convert media embed functions that deal with rewriting specific corporate ↵redmatrix2016-05-081-23/+6
| | | | | | | | services to addon hooks
| * improve non-ACL option description in ACL dialogTreer2016-05-082-4/+190
| |
* | make editblock use status_editor()Mario Vavti2016-05-071-14/+11
|/
* missed one other place where we called comanche outside the page buildredmatrix2016-05-061-2/+2
|
* objectify comancheredmatrix2016-05-052-422/+39
|
* commentsredmatrix2016-05-051-0/+4
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-051-5/+32
|\
| * Unify permissions dialog for network posts, channel posts, and remote postsTreer2016-05-061-5/+32
| | | | | | | | | | | | * 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-051-1/+36
|/ | | | | | | | | | | | | | | - 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-052-0/+44
| | | | change this in the PDL
* isolate all the tagadelic core code into a class and reuse itredmatrix2016-05-041-85/+4
|
* provide a tag cloud for app categories and allow filtering apps from thisredmatrix2016-05-043-1/+94
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-041-5/+22
|\
| * add help to some permissions dialogsTreer2016-05-051-3/+3
| |
| * Refine permissions dialog UITreer2016-05-041-5/+22
| |
* | add categories to apps (wip)redmatrix2016-05-043-29/+164
|/
* Sync the current list of system apps with the built-in name translation ↵redmatrix2016-05-031-3/+8
| | | | table. Some of the names were changed in the past without the translation table being updated to reflect it.
* more background work for app management - give every member a copy of all ↵redmatrix2016-05-032-15/+62
| | | | 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.
* some preliminary structural work for app organisationredmatrix2016-05-031-2/+7
|
* more security stuffredmatrix2016-05-022-50/+36
|
* 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-021-2/+2
|
* a couple of bugfixes from earlier checkins and implementation of source tagsredmatrix2016-05-012-1/+35
|
* use only the std_versionredmatrix2016-05-013-3/+3
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-011-2/+10
|\
| * make weblink and attach button hideable and some minor fixesMario Vavti2016-05-011-2/+10
| |
* | some much needed work on oembed securityredmatrix2016-05-013-56/+214
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-306-75/+109
|\
| * Merge pull request #362 from Treer/fontawesomeredmatrix2016-05-015-33/+33
| |\ | | | | | | Update Font-Awesome to 4.6.1
| | * update icon names in include/Treer2016-05-015-33/+33
| | |
| * | make mod editlayout use status_editor()Mario Vavti2016-04-301-1/+1
| | |
| * | Merge pull request #361 from Treer/bbcodegit-marijus2016-04-301-0/+50
| |\ \ | | |/ | |/| Add definition lists to bbcode
| | * improve whitespace control around definition list ([dl]) bbcodeTreer2016-04-301-4/+6
| | |
| | * Add definition lists to bbcodeTreer2016-04-301-0/+48
| | |
| * | get rid of the unused ispublic variableMario Vavti2016-04-291-1/+0
| | |
| * | some work on making mod editpost use status_editor() - if you find anything ↵Mario Vavti2016-04-291-16/+26
| | | | | | | | | | | | related to jot broken please revert this commit
| * | jot: cleanup unused variablesMario Vavti2016-04-291-25/+0
| | |
* | | trim engr_units string slight improvement to avoid subtle bugsredmatrix2016-04-291-1/+3
|/ /
* / allow engineering units (e.g. 400M, 1G) as service class limitsredmatrix2016-04-283-2/+5
|/
* provide courtesy function for syncing one item. We'll probably be doing this ↵redmatrix2016-04-271-0/+15
| | | | a lot.
* Use / for album name in photo activities if no album present.redmatrix2016-04-271-1/+1
|