aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵redmatrix2016-06-172-1/+2
| | | | | | | | link for editing and as a destination in case there is no thing photo. If there's a photo, the photo link will take you to the thing URL.
| * 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
| |\ | | | | | | Wiki rename page feature added. Bug fixes related to git commits.
| | * 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 ↵Andrew Manning2016-06-151-9/+46
| | | | | | | | | | | | | | | | fixes.
| * | | This was the reason for the large line widths - an extra linefeed after each ↵redmatrix2016-06-151-1/+1
| | | | | | | | | | | | | | | | li element
| * | | provide syntax based [colour] highlighting on code blocks for popular ↵redmatrix2016-06-152-0/+52
| | |/ | |/| | | | | | | languages. I'm not happy with the line height on the list elements but couldn't see where this was defaulted. This uses the syntax [code=xxx]some code snippet[/code], where xxx represents a code/language style - with about 18 builtins.
* | | 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 ↵redmatrix2016-06-1310-65/+73
| | | | | | | | function in the iconfig class would be a search which takes a service id and type and uid, matches against an item and returns the iid. That could save a bit of code duplication.
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-134-24/+61
|\|
| * Merge pull request #416 from anaqreon/embedphotoshubzilla2016-06-131-0/+12
| |\ | | | | | | Add embed photos button with album browser to new post editor
| | * 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 ↵Andrew Manning2016-06-121-1/+1
| | |/ | |/| | | | | | | JavaScript code injection.
| * | remove debuggingredmatrix2016-06-111-1/+0
| | |
| * | Work supporting issue #411, add an optional priority (int) as a second arg ↵redmatrix2016-06-111-11/+23
| | | | | | | | | | | | | | | | | | to head_add_js to affect the load ordering, larger numbered priorities will be included after lower numbered ones. Default priority is 0.Note that we treat main.js differently and always add main.js to the page last, regardless of any other ordering.
* | | 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 ↵Andrew Manning2016-06-081-2/+11
| | | | | | | | | | | | | | | | using the write_pages per-channel permission.
| * | | 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 ↵Andrew Manning2016-06-051-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | replaces the editor text but does not save the page.
| * | | | | 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 ↵Andrew Manning2016-06-042-24/+36
| | | | | | | | | | | | | | | | | | | | | | | | characters do not seem to break things.
| * | | | | Created three distinct names for wiki and page that are suitable for URL, ↵Andrew Manning2016-06-041-14/+42
| | | | | | | | | | | | | | | | | | | | | | | | HTML, and raw display. Implemented in new wiki POST activity only so far.
| * | | | | 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 ↵Andrew Manning2016-05-302-6/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | history for wiki pages.
| * | | | | | | Replaced wiki item record object field with ActivityStreams information. ↵Andrew Manning2016-05-301-49/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wiki git repo path is stored in iconfig instead.
| * | | | | | | 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
| | | | | | | | |