aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into sabre32Mario Vavti2016-06-201-1/+1
|\
| * Merge branch 'master' into devMario Vavti2016-06-201-1/+1
| |\
| | * Merge branch '1.8RC'redmatrix2016-06-1975-8346/+2856
| | |\
| | | * add new connection to default group when auto-acceptedredmatrix2016-06-152-1/+11
| | | * 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
| | * | When picktime is false, close date selector on date selectOda2016-06-181-1/+1
| | * | issue #386 (master)redmatrix2016-05-161-1/+1
| | * | issue #383redmatrix2016-05-141-1/+0
| | * | SECURITY: edited comment to private post loses privacy info. Not visible in s...redmatrix2016-05-121-0/+10
* | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-202-11/+16
|\| | |
| * | | Don't use count() to check DB resultsredmatrix2016-06-192-11/+16
* | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-184-2/+9
|\| | |
| * | | 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 branch 'dev' into sabre32Mario Vavti2016-06-174-8/+38
|\| | |
| * | | core changes to better support media migrationsredmatrix2016-06-163-8/+33
| * | | code commentsredmatrix2016-06-151-0/+5
* | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-164-12/+114
|\| | |
| * | | 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
| | |/ / / | |/| | |
* | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-152-1/+11
|\| | | |
| * | | | add new connection to default group when auto-acceptedredmatrix2016-06-152-1/+11
| |/ / /
* | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-1411-75/+101
|\| | |
| * | | 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 branch 'dev' into sabre32Mario Vavti2016-06-134-24/+61
|\| | |
| * | | 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
| | |_|/ | |/| |
* | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-111-1/+1
|\| | |
| * | | iconfig sharing not set correctlyredmatrix2016-06-101-1/+1
* | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-102-0/+471
|\| | |
| * | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-091-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
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-073-191/+23
| |\ \ \ \
| * | | | | Remove debugging logger statementsAndrew Manning2016-06-052-4/+0
| * | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-053-20/+19
| |\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-24 07:23:38 +0000