aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-206-13/+25
|\
| * Don't use count() to check DB resultsredmatrix2016-06-192-11/+16
| * the text link to a thing will take you to the local thing page, both as a lin...redmatrix2016-06-172-1/+2
| * 1. string update, 2. pretty print json blobsredmatrix2016-06-172-1/+7
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-173-8/+33
|\|
| * core changes to better support media migrationsredmatrix2016-06-163-8/+33
* | Wiki page revision comparison tool with diff displayed in modal dialog. Lever...Andrew Manning2016-06-171-1/+43
|/
* code commentsredmatrix2016-06-151-0/+5
* custom request methods for curlredmatrix2016-06-151-3/+13
* provide a default for undefined languagesredmatrix2016-06-151-0/+1
* ignore case in language names and add 'js' as an alias for 'javascript'redmatrix2016-06-152-4/+6
* Merge pull request #422 from anaqreon/wikihubzilla2016-06-161-9/+46
|\
| * Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-152-1/+11
| |\
| * | Rename page feature added. Fixed bug in git commit function and other minor f...Andrew Manning2016-06-151-9/+46
* | | This was the reason for the large line widths - an extra linefeed after each ...redmatrix2016-06-151-1/+1
* | | provide syntax based [colour] highlighting on code blocks for popular languag...redmatrix2016-06-152-0/+52
| |/ |/|
* | add new connection to default group when auto-acceptedredmatrix2016-06-152-1/+11
|/
* some work to provide propagation and honouring of the item_notshown flag.redmatrix2016-06-132-8/+23
* missing iconfig conversionredmatrix2016-06-131-3/+6
* deprecate the item_id table - replace with iconfig. A possibly useful functio...redmatrix2016-06-1310-65/+73
* Merge pull request #416 from anaqreon/embedphotoshubzilla2016-06-131-0/+12
|\
| * 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 JavaScri...Andrew Manning2016-06-121-1/+1
| |/ |/|
* | remove debuggingredmatrix2016-06-111-1/+0
* | Work supporting issue #411, add an optional priority (int) as a second arg to...redmatrix2016-06-111-11/+23
* | 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 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