aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-041844-458/+517
|\
| * allow bbcode emojis (at least the single unicode character forms)redmatrix2016-06-031-0/+14
| * App::init() should be staticredmatrix2016-06-031-1/+1
| * need to set item_origin on locally created reactions so they propagate properlyredmatrix2016-06-031-0/+1
| * missed table rename in event query in mod_manageredmatrix2016-06-031-5/+5
| * allow any (current) emoji to be displayed on any site, and provide a default ...redmatrix2016-06-031775-15/+15
| * turn emoji ability into a feature so that either a member or the site admin c...redmatrix2016-06-033-1/+3
| * missed an object -> obj conversion in prepare_bodyredmatrix2016-06-031-1/+1
| * stringsredmatrix2016-06-031-381/+336
| * some theming for emoji buttonMario Vavti2016-06-032-95/+95
| * restrict emoji reactions to the top level for now.redmatrix2016-06-021-0/+2
| * menu entries for basic emoji support. I could use a bit of help theming this....redmatrix2016-06-022-0/+33
| * experimental emoji supportredmatrix2016-06-0261-0/+52
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-02428-56247/+1158
|\|
| * some initial emoji reaction workredmatrix2016-06-022-1/+6
| * preserve app categories when updating a system appredmatrix2016-06-021-7/+25
| * adjust algorithm to ensure new system apps are installed.redmatrix2016-06-021-3/+12
| * install system apps if a) they have never been installed, or b) if the app ve...redmatrix2016-06-021-10/+29
| * check all return valuesredmatrix2016-06-011-1/+1
| * the rest of the schema updates - WARNING: some third party plugins may fail; ...redmatrix2016-06-0142-616/+541
| * more db column renamesredmatrix2016-05-3136-163/+210
| * more removal of reserved words from DB schemasredmatrix2016-05-3112-37/+54
| * provide a sort of mutex lock around db logging so it can't possibly recurse. ...redmatrix2016-05-312-10/+18
| * don't remove missing hooks while update_r1169 is happpening - temp fixredmatrix2016-05-311-5/+8
| * remove unused tablesredmatrix2016-05-305-258/+17
| * remove a bunch of unused stuff, some of which is orphaned and some which repr...redmatrix2016-05-30343-54949/+0
| * don't update hubloc_connected any more often than 15 minutes. We don't requir...redmatrix2016-05-301-5/+11
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-303-18/+21
| |\
| | * Merge pull request #405 from git-marijus/devhubzilla2016-05-313-18/+21
| | |\
| | | * render code bbcode inline if there are no linebreaks in the text.Mario Vavti2016-05-303-18/+21
| * | | start removing reserved words from database column names (this run: addon and...redmatrix2016-05-3010-33/+51
| * | | begin moving config to zotlabs. Leave procedural stubs for backward comaptibi...redmatrix2016-05-302-144/+183
| |/ /
| * / 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-027-120/+135
* | Created page history widget to dynamically fetch and display the git commit h...Andrew Manning2016-05-305-10/+107
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-301-1/+1
|\|
| * undefined functionredmatrix2016-05-291-1/+1
* | Replaced wiki item record object field with ActivityStreams information. Wiki...Andrew Manning2016-05-304-72/+53
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-294-4/+6
|\|
| * fix remote_channel(), update php minversion requirementredmatrix2016-05-294-4/+6
* | Fixed bug in access control. Hide new wiki/page buttons if not channel owner.Andrew Manning2016-05-293-7/+3
* | Remove Parsedown library files and remove references.Andrew Manning2016-05-29113-2702/+0
* | Only show wiki delete control if channel ownerAndrew Manning2016-05-294-7/+16
* | Hide page controls when not owner. Fixed some serious access control issues.Andrew Manning2016-05-291-22/+27
* | Hacked Parsedown and Markdown to add class inline-code to <code> blocks for p...Andrew Manning2016-05-295-6/+28
* | Fixed bug where page file was not loaded because of urlencoding/urldecodingAndrew Manning2016-05-291-1/+1
* | Home page create with new wiki. URL redirects here when no page given. Fixed ...Andrew Manning2016-05-292-4/+18
* | Git commit made for the page edits when the page is saved.Andrew Manning2016-05-293-5/+62
* | Wiki pages can be saved.Andrew Manning2016-05-283-6/+83
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-285-2123/+2151
|\|