aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \
| * | | | | 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
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-0227-659/+420
| |\ \ \ \ \ \
| * | | | | | | 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
| |\ \ \ \ \ \ \
| * | | | | | | | 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