aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #416 from anaqreon/embedphotoshubzilla2016-06-131-0/+12
|\ | | | | Add embed photos button with album browser to new post editor
| * Merge remote-tracking branch 'upstream/dev' into embedphotosAndrew Manning2016-06-125-12/+499
| |\
| * | Stashing changes. Not a functional state.Andrew Manning2016-06-091-0/+12
| | |
* | | DB schema issue with importredmatrix2016-06-121-12/+26
| | |
* | | Apply purify_html to page content before preview and save to prevent ↵Andrew Manning2016-06-121-1/+1
| |/ |/| | | | | JavaScript code injection.
* | remove debuggingredmatrix2016-06-111-1/+0
| |
* | Work supporting issue #411, add an optional priority (int) as a second arg ↵redmatrix2016-06-111-11/+23
| | | | | | | | | | | | to head_add_js to affect the load ordering, larger numbered priorities will be included after lower numbered ones. Default priority is 0.Note that we treat main.js differently and always add main.js to the page last, regardless of any other ordering.
* | iconfig sharing not set correctlyredmatrix2016-06-101-1/+1
| |
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-091-0/+5
|\ \
| * | potential fix to hubzilla-addons issue 16redmatrix2016-06-081-0/+5
| |/
* | Revised permissions checks across API and enabled collaborative editing ↵Andrew Manning2016-06-081-2/+11
| | | | | | | | using the write_pages per-channel permission.
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-082-369/+20
|\|
| * block random_profile from accessing sys channelsredmatrix2016-06-071-1/+2
| |
| * Finish the config familyredmatrix2016-06-071-368/+18
| |
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-073-191/+23
|\|
| * 'recent photos' query was buggered, also fix issue #163 by adding ↵redmatrix2016-06-072-16/+16
| | | | | | | | configurable sort order to the album widget - default is album name ascending
| * rename admin/users to admin/accounts, provide sortable columns in account ↵redmatrix2016-06-061-1/+1
| | | | | | | | and channel summaries - issue #255
| * move pconfig to static classredmatrix2016-06-051-174/+6
| |
* | Remove debugging logger statementsAndrew Manning2016-06-052-4/+0
| |
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-053-20/+19
|\|
| * provide a hover class for smiley emojis which renders them slightly larger ↵redmatrix2016-06-041-1/+1
| | | | | | | | on compatible devices when you single them out for inspection
| * another switch of type and ttyperedmatrix2016-06-041-1/+1
| |
| * the :tone variants are messed up, remove themredmatrix2016-06-041-0/+2
| |
| * return of the project smilieredmatrix2016-06-041-2/+3
| |
| * For emojis in posts, extend smilies and save a lot of duplication of effortredmatrix2016-06-042-14/+12
| |
| * cross-site encoding issue with tagsredmatrix2016-06-041-4/+2
| |
* | Basic page reversion implemented. The revert button on the history view ↵Andrew Manning2016-06-051-1/+38
| | | | | | | | replaces the editor text but does not save the page.
* | Page deletion implemented. Hide the delete button and disallow for Home page.Andrew Manning2016-06-041-0/+18
| |
* | Wiki and page filenames are abstracted from their displayed names. Special ↵Andrew Manning2016-06-042-24/+36
| | | | | | | | characters do not seem to break things.
* | Created three distinct names for wiki and page that are suitable for URL, ↵Andrew Manning2016-06-041-14/+42
| | | | | | | | HTML, and raw display. Implemented in new wiki POST activity only so far.
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-043-1/+16
|\|
| * allow bbcode emojis (at least the single unicode character forms)redmatrix2016-06-031-0/+14
| |
| * turn emoji ability into a feature so that either a member or the site admin ↵redmatrix2016-06-031-0/+1
| | | | | | | | can disable it. Default is enabled.
| * missed an object -> obj conversion in prepare_bodyredmatrix2016-06-031-1/+1
| |
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-0227-659/+420
|\|
| * some initial emoji reaction workredmatrix2016-06-021-1/+5
| |
| * the rest of the schema updates - WARNING: some third party plugins may fail; ↵redmatrix2016-06-0113-372/+236
| | | | | | | | e.g. embedphotos and chess. $item['object'] is now $item['obj'] and $photo['type'] is $photo['mimetype'], $photo['scale'] is $photo['imgscale'] and $photo['data'] is now $photo['content']. There are a number of other changes, but these are the ones noted to cause issues with third-party plugins. The project plugins have been updated. Please note any new issues as this effort touched a lot of code in a lot of files.
| * more db column renamesredmatrix2016-05-3112-79/+96
| |
| * more removal of reserved words from DB schemasredmatrix2016-05-313-10/+10
| |
| * provide a sort of mutex lock around db logging so it can't possibly recurse. ↵redmatrix2016-05-312-10/+18
| | | | | | | | Previous attempts to do something similar using other methods haven't worked out satisfactorily.
| * don't remove missing hooks while update_r1169 is happpening - temp fixredmatrix2016-05-311-5/+8
| |
| * don't update hubloc_connected any more often than 15 minutes. We don't ↵redmatrix2016-05-301-5/+11
| | | | | | | | require that level of granularity and the frequent writes are causing issues with the stability of that table.
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-301-7/+7
| |\
| | * Merge pull request #405 from git-marijus/devhubzilla2016-05-311-7/+7
| | |\ | | | | | | | | render code bbcode inline if there are no linebreaks in the text.
| | | * render code bbcode inline if there are no linebreaks in the text.Mario Vavti2016-05-301-7/+7
| | | |
| * | | start removing reserved words from database column names (this run: addon ↵redmatrix2016-05-304-15/+15
| | | | | | | | | | | | | | | | and hook)
| * | | begin moving config to zotlabs. Leave procedural stubs for backward ↵redmatrix2016-05-301-144/+17
| |/ / | | | | | | | | | comaptibility
| * / redundant dev line from an earlier modification causes issue #404redmatrix2016-05-302-20/+6
| |/
* | Major corrections to access control and page construction.Andrew Manning2016-06-022-18/+19
| |
* | Created page history widget to dynamically fetch and display the git commit ↵Andrew Manning2016-05-302-6/+35
| | | | | | | | history for wiki pages.