Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rename page feature added. Fixed bug in git commit function and other minor ↵ | Andrew Manning | 2016-06-15 | 1 | -9/+46 |
| | | | | fixes. | ||||
* | some work to provide propagation and honouring of the item_notshown flag. | redmatrix | 2016-06-13 | 2 | -8/+23 |
| | |||||
* | missing iconfig conversion | redmatrix | 2016-06-13 | 1 | -3/+6 |
| | |||||
* | deprecate the item_id table - replace with iconfig. A possibly useful ↵ | redmatrix | 2016-06-13 | 10 | -65/+73 |
| | | | | function in the iconfig class would be a search which takes a service id and type and uid, matches against an item and returns the iid. That could save a bit of code duplication. | ||||
* | Merge pull request #416 from anaqreon/embedphotos | hubzilla | 2016-06-13 | 1 | -0/+12 |
|\ | | | | | Add embed photos button with album browser to new post editor | ||||
| * | Merge remote-tracking branch 'upstream/dev' into embedphotos | Andrew Manning | 2016-06-12 | 5 | -12/+499 |
| |\ | |||||
| * | | Stashing changes. Not a functional state. | Andrew Manning | 2016-06-09 | 1 | -0/+12 |
| | | | |||||
* | | | DB schema issue with import | redmatrix | 2016-06-12 | 1 | -12/+26 |
| | | | |||||
* | | | Apply purify_html to page content before preview and save to prevent ↵ | Andrew Manning | 2016-06-12 | 1 | -1/+1 |
| |/ |/| | | | | | JavaScript code injection. | ||||
* | | remove debugging | redmatrix | 2016-06-11 | 1 | -1/+0 |
| | | |||||
* | | Work supporting issue #411, add an optional priority (int) as a second arg ↵ | redmatrix | 2016-06-11 | 1 | -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 correctly | redmatrix | 2016-06-10 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-09 | 1 | -0/+5 |
|\ \ | |||||
| * | | potential fix to hubzilla-addons issue 16 | redmatrix | 2016-06-08 | 1 | -0/+5 |
| |/ | |||||
* | | Revised permissions checks across API and enabled collaborative editing ↵ | Andrew Manning | 2016-06-08 | 1 | -2/+11 |
| | | | | | | | | using the write_pages per-channel permission. | ||||
* | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-08 | 2 | -369/+20 |
|\| | |||||
| * | block random_profile from accessing sys channels | redmatrix | 2016-06-07 | 1 | -1/+2 |
| | | |||||
| * | Finish the config family | redmatrix | 2016-06-07 | 1 | -368/+18 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-07 | 3 | -191/+23 |
|\| | |||||
| * | 'recent photos' query was buggered, also fix issue #163 by adding ↵ | redmatrix | 2016-06-07 | 2 | -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 ↵ | redmatrix | 2016-06-06 | 1 | -1/+1 |
| | | | | | | | | and channel summaries - issue #255 | ||||
| * | move pconfig to static class | redmatrix | 2016-06-05 | 1 | -174/+6 |
| | | |||||
* | | Remove debugging logger statements | Andrew Manning | 2016-06-05 | 2 | -4/+0 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-05 | 3 | -20/+19 |
|\| | |||||
| * | provide a hover class for smiley emojis which renders them slightly larger ↵ | redmatrix | 2016-06-04 | 1 | -1/+1 |
| | | | | | | | | on compatible devices when you single them out for inspection | ||||
| * | another switch of type and ttype | redmatrix | 2016-06-04 | 1 | -1/+1 |
| | | |||||
| * | the :tone variants are messed up, remove them | redmatrix | 2016-06-04 | 1 | -0/+2 |
| | | |||||
| * | return of the project smilie | redmatrix | 2016-06-04 | 1 | -2/+3 |
| | | |||||
| * | For emojis in posts, extend smilies and save a lot of duplication of effort | redmatrix | 2016-06-04 | 2 | -14/+12 |
| | | |||||
| * | cross-site encoding issue with tags | redmatrix | 2016-06-04 | 1 | -4/+2 |
| | | |||||
* | | Basic page reversion implemented. The revert button on the history view ↵ | Andrew Manning | 2016-06-05 | 1 | -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 Manning | 2016-06-04 | 1 | -0/+18 |
| | | |||||
* | | Wiki and page filenames are abstracted from their displayed names. Special ↵ | Andrew Manning | 2016-06-04 | 2 | -24/+36 |
| | | | | | | | | characters do not seem to break things. | ||||
* | | Created three distinct names for wiki and page that are suitable for URL, ↵ | Andrew Manning | 2016-06-04 | 1 | -14/+42 |
| | | | | | | | | HTML, and raw display. Implemented in new wiki POST activity only so far. | ||||
* | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-04 | 3 | -1/+16 |
|\| | |||||
| * | allow bbcode emojis (at least the single unicode character forms) | redmatrix | 2016-06-03 | 1 | -0/+14 |
| | | |||||
| * | turn emoji ability into a feature so that either a member or the site admin ↵ | redmatrix | 2016-06-03 | 1 | -0/+1 |
| | | | | | | | | can disable it. Default is enabled. | ||||
| * | missed an object -> obj conversion in prepare_body | redmatrix | 2016-06-03 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-02 | 27 | -659/+420 |
|\| | |||||
| * | some initial emoji reaction work | redmatrix | 2016-06-02 | 1 | -1/+5 |
| | | |||||
| * | the rest of the schema updates - WARNING: some third party plugins may fail; ↵ | redmatrix | 2016-06-01 | 13 | -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 renames | redmatrix | 2016-05-31 | 12 | -79/+96 |
| | | |||||
| * | more removal of reserved words from DB schemas | redmatrix | 2016-05-31 | 3 | -10/+10 |
| | | |||||
| * | provide a sort of mutex lock around db logging so it can't possibly recurse. ↵ | redmatrix | 2016-05-31 | 2 | -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 fix | redmatrix | 2016-05-31 | 1 | -5/+8 |
| | | |||||
| * | don't update hubloc_connected any more often than 15 minutes. We don't ↵ | redmatrix | 2016-05-30 | 1 | -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_merge | redmatrix | 2016-05-30 | 1 | -7/+7 |
| |\ | |||||
| | * | Merge pull request #405 from git-marijus/dev | hubzilla | 2016-05-31 | 1 | -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 Vavti | 2016-05-30 | 1 | -7/+7 |
| | | | | |||||
| * | | | start removing reserved words from database column names (this run: addon ↵ | redmatrix | 2016-05-30 | 4 | -15/+15 |
| | | | | | | | | | | | | | | | | and hook) |