aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* implement the singleton delivery stuffredmatrix2016-04-263-8/+38
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-262-45/+28
|\
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-04-261-6/+12
| |\
| * | move spoiler= and quote= bbcode handling from prepare_body() to bbcode() and ↵Mario Vavti2016-04-262-45/+28
| | | | | | | | | | | | add open tag to bbco_autocomplete
* | | move iconfig functions to include/config.php with all the rest of the ↵redmatrix2016-04-264-159/+165
| |/ |/| | | | | configs, fix an issue with singleton discovery and start work on singleton delivery
* | some cleanup on the mysqli driverredmatrix2016-04-251-6/+12
|/
* Setup was horked after this commit and I couldn't easily make it right so ↵redmatrix2016-04-254-79/+66
| | | | | | | | reverting - will try again at a future date Revert "remove global db variable" This reverts commit c3b0c0f32a17649503db67f208cce6f9e0cdc322.
* remove global db variableredmatrix2016-04-254-66/+79
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-231-13/+4
|\
| * simplify context help js and move it to main.js where all the nav related js ↵Mario Vavti2016-04-231-13/+4
| | | | | | | | resides, do not close the context help if we click outside of it - members might want to work on something while help is open, move the link to /help to dropdown-menu.
* | this should work to call a hook for a string class methodredmatrix2016-04-231-2/+12
| |
* | Class method support for hooksredmatrix2016-04-231-2/+3
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-212-9/+27
|\
| * some fixes for contextual help and disable transition animation for now - it ↵Mario Vavti2016-04-211-6/+11
| | | | | | | | looked really wired because main moved with a different speed than help-content and help-content can not be displayed under the panel as it is implemented now.
| * Merge pull request #351 from anaqreon/toggle-context-helpgit-marijus2016-04-211-2/+9
| |\ | | | | | | Toggle context help
| | * Added admin/site setting that toggles context help panel. If disabled, ↵Andrew Manning2016-04-211-0/+6
| | | | | | | | | | | | original help menu button behavior is restored.
| | * Merge branch 'dev' into toggle-context-helpAndrew Manning2016-04-205-21/+212
| | |\
| | * | Try toggling context help using onclick attributeAndrew Manning2016-04-191-2/+3
| | | |
| * | | Merge pull request #348 from git-marijus/devgit-marijus2016-04-211-5/+11
| |\ \ \ | | | | | | | | | | add querystring to css and js which is added via head_add_{css, js}
| | * | | add querystring to css and js which is added via head_add_{css, js}Mario Vavti2016-04-191-5/+11
| | | |/ | | |/|
* | / | new hook interface (the old one still works but requires handlers to have ↵redmatrix2016-04-211-13/+13
|/ / / | | | | | | | | | two calling arguments; the first of which is no longer used). The new interface is called from Zotlabs\Extend\Hook::register() and allows you to specify which hook version to use. The default will be the new interface with one function argument. We also implement the hook priority field which was always there but needed to be set manually in the DB. This provides a way for two hook handlers that implement the same hook interface to determine which order to be called in the event of conflicts.