Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-04 | 1844 | -458/+517 |
|\ | |||||
| * | allow bbcode emojis (at least the single unicode character forms) | redmatrix | 2016-06-03 | 1 | -0/+14 |
| | | |||||
| * | App::init() should be static | redmatrix | 2016-06-03 | 1 | -1/+1 |
| | | |||||
| * | need to set item_origin on locally created reactions so they propagate properly | redmatrix | 2016-06-03 | 1 | -0/+1 |
| | | |||||
| * | missed table rename in event query in mod_manage | redmatrix | 2016-06-03 | 1 | -5/+5 |
| | | |||||
| * | allow any (current) emoji to be displayed on any site, and provide a default ↵ | redmatrix | 2016-06-03 | 1775 | -15/+15 |
| | | | | | | | | list of reactions that can be over-ridden via configuration if a site doesn't like our choices or perhaps the ordering of our choices. | ||||
| * | turn emoji ability into a feature so that either a member or the site admin ↵ | redmatrix | 2016-06-03 | 3 | -1/+3 |
| | | | | | | | | can disable it. Default is enabled. | ||||
| * | missed an object -> obj conversion in prepare_body | redmatrix | 2016-06-03 | 1 | -1/+1 |
| | | |||||
| * | strings | redmatrix | 2016-06-03 | 1 | -381/+336 |
| | | |||||
| * | some theming for emoji button | Mario Vavti | 2016-06-03 | 2 | -95/+95 |
| | | |||||
| * | restrict emoji reactions to the top level for now. | redmatrix | 2016-06-02 | 1 | -0/+2 |
| | | |||||
| * | menu entries for basic emoji support. I could use a bit of help theming ↵ | redmatrix | 2016-06-02 | 2 | -0/+33 |
| | | | | | | | | this. It may also be better rendered as a panel of buttons than a dropdown menu. Eventually we should probably allow the system admin to configure the emojis they want; as there are a large number. I only brought in a small collection that I thought would be most useful as post reactions. | ||||
| * | experimental emoji support | redmatrix | 2016-06-02 | 61 | -0/+52 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-02 | 428 | -56247/+1158 |
|\| | |||||
| * | some initial emoji reaction work | redmatrix | 2016-06-02 | 2 | -1/+6 |
| | | |||||
| * | preserve app categories when updating a system app | redmatrix | 2016-06-02 | 1 | -7/+25 |
| | | |||||
| * | adjust algorithm to ensure new system apps are installed. | redmatrix | 2016-06-02 | 1 | -3/+12 |
| | | |||||
| * | install system apps if a) they have never been installed, or b) if the app ↵ | redmatrix | 2016-06-02 | 1 | -10/+29 |
| | | | | | | | | version changes | ||||
| * | check all return values | redmatrix | 2016-06-01 | 1 | -1/+1 |
| | | |||||
| * | the rest of the schema updates - WARNING: some third party plugins may fail; ↵ | redmatrix | 2016-06-01 | 42 | -616/+541 |
| | | | | | | | | 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 | 36 | -163/+210 |
| | | |||||
| * | more removal of reserved words from DB schemas | redmatrix | 2016-05-31 | 12 | -37/+54 |
| | | |||||
| * | 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 |
| | | |||||
| * | remove unused tables | redmatrix | 2016-05-30 | 5 | -258/+17 |
| | | |||||
| * | remove a bunch of unused stuff, some of which is orphaned and some which ↵ | redmatrix | 2016-05-30 | 343 | -54949/+0 |
| | | | | | | | | represents dead development efforts | ||||
| * | 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 | 3 | -18/+21 |
| |\ | |||||
| | * | Merge pull request #405 from git-marijus/dev | hubzilla | 2016-05-31 | 3 | -18/+21 |
| | |\ | | | | | | | | | 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 | 3 | -18/+21 |
| | | | | |||||
| * | | | start removing reserved words from database column names (this run: addon ↵ | redmatrix | 2016-05-30 | 10 | -33/+51 |
| | | | | | | | | | | | | | | | | and hook) | ||||
| * | | | begin moving config to zotlabs. Leave procedural stubs for backward ↵ | redmatrix | 2016-05-30 | 2 | -144/+183 |
| |/ / | | | | | | | | | | comaptibility | ||||
| * / | redundant dev line from an earlier modification causes issue #404 | redmatrix | 2016-05-30 | 2 | -20/+6 |
| |/ | |||||
* | | Major corrections to access control and page construction. | Andrew Manning | 2016-06-02 | 7 | -120/+135 |
| | | |||||
* | | Created page history widget to dynamically fetch and display the git commit ↵ | Andrew Manning | 2016-05-30 | 5 | -10/+107 |
| | | | | | | | | history for wiki pages. | ||||
* | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-05-30 | 1 | -1/+1 |
|\| | |||||
| * | undefined function | redmatrix | 2016-05-29 | 1 | -1/+1 |
| | | |||||
* | | Replaced wiki item record object field with ActivityStreams information. ↵ | Andrew Manning | 2016-05-30 | 4 | -72/+53 |
| | | | | | | | | Wiki git repo path is stored in iconfig instead. | ||||
* | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-05-29 | 4 | -4/+6 |
|\| | |||||
| * | fix remote_channel(), update php minversion requirement | redmatrix | 2016-05-29 | 4 | -4/+6 |
| | | |||||
* | | Fixed bug in access control. Hide new wiki/page buttons if not channel owner. | Andrew Manning | 2016-05-29 | 3 | -7/+3 |
| | | |||||
* | | Remove Parsedown library files and remove references. | Andrew Manning | 2016-05-29 | 113 | -2702/+0 |
| | | |||||
* | | Only show wiki delete control if channel owner | Andrew Manning | 2016-05-29 | 4 | -7/+16 |
| | | |||||
* | | Hide page controls when not owner. Fixed some serious access control issues. | Andrew Manning | 2016-05-29 | 1 | -22/+27 |
| | | |||||
* | | Hacked Parsedown and Markdown to add class inline-code to <code> blocks for ↵ | Andrew Manning | 2016-05-29 | 5 | -6/+28 |
| | | | | | | | | proper inline code rendering. Stopped using Parsedown even though Markdown is slower, hence extra delay when previewing pages. | ||||
* | | Fixed bug where page file was not loaded because of urlencoding/urldecoding | Andrew Manning | 2016-05-29 | 1 | -1/+1 |
| | | |||||
* | | Home page create with new wiki. URL redirects here when no page given. Fixed ↵ | Andrew Manning | 2016-05-29 | 2 | -4/+18 |
| | | | | | | | | bug with author in wiki item table record. | ||||
* | | Git commit made for the page edits when the page is saved. | Andrew Manning | 2016-05-29 | 3 | -5/+62 |
| | | |||||
* | | Wiki pages can be saved. | Andrew Manning | 2016-05-28 | 3 | -6/+83 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-05-28 | 5 | -2123/+2151 |
|\| |