aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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 using...Andrew Manning2016-06-081-2/+11
* | 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 configurabl...redmatrix2016-06-072-16/+16
| * rename admin/users to admin/accounts, provide sortable columns in account and...redmatrix2016-06-061-1/+1
| * 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 on...redmatrix2016-06-041-1/+1
| * 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 repla...Andrew Manning2016-06-051-1/+38
* | 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 ch...Andrew Manning2016-06-042-24/+36
* | Created three distinct names for wiki and page that are suitable for URL, HTM...Andrew Manning2016-06-041-14/+42
* | 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 c...redmatrix2016-06-031-0/+1
| * 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
| * 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
| * 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 requir...redmatrix2016-05-301-5/+11
| * 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.Mario Vavti2016-05-301-7/+7
| * | | start removing reserved words from database column names (this run: addon and...redmatrix2016-05-304-15/+15
| * | | begin moving config to zotlabs. Leave procedural stubs for backward comaptibi...redmatrix2016-05-301-144/+17
| |/ /
| * / 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 h...Andrew Manning2016-05-302-6/+35
* | Replaced wiki item record object field with ActivityStreams information. Wiki...Andrew Manning2016-05-301-49/+40
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-291-0/+2
|\|
| * fix remote_channel(), update php minversion requirementredmatrix2016-05-291-0/+2
* | Fixed bug in access control. Hide new wiki/page buttons if not channel owner.Andrew Manning2016-05-291-5/+1
* | Only show wiki delete control if channel ownerAndrew Manning2016-05-292-7/+13
* | Fixed bug where page file was not loaded because of urlencoding/urldecodingAndrew Manning2016-05-291-1/+1
* | Git commit made for the page edits when the page is saved.Andrew Manning2016-05-291-3/+40
* | Wiki pages can be saved.Andrew Manning2016-05-281-0/+22