aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* the xchan_query wasn't fully optimised as we were comparing quoted and ↵redmatrix2016-06-221-4/+4
| | | | unquoted strings when looking for duplicates
* db statement debuggingredmatrix2016-06-221-1/+4
|
* use the normal html escape for '@' in addresses rather than the high-plane ↵redmatrix2016-06-222-2/+2
| | | | unicode variant. This makes it copy-able, but not easily scrape-able.
* vcard spec changesredmatrix2016-06-211-0/+1
|
* 1. provide automatic relocation of important links in items that are ↵redmatrix2016-06-215-46/+60
| | | | | | | imported or synced to clones 2. provide framework for custom curl request bodies using custom/non-standard request methods. This was a real nightmare because curl doesn't actually let you specify a string to send as the request body (except when doing POST). You have to treat it as a file upload using a custom file handler function which provides the actual content in chunks as if it were buffered I/O. 3. item_store and item_store_update now return the item that was stored
* make sure the optimisations are reliableredmatrix2016-06-201-1/+1
|
* code optimisationredmatrix2016-06-203-9/+8
|
* update attach on import if existsredmatrix2016-06-201-2/+2
|
* Merge pull request #429 from anaqreon/wikihubzilla2016-06-211-1/+43
|\ | | | | Wiki page revision comparison viewer
| * Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-206-13/+25
| |\
| * \ Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-173-8/+33
| |\ \
| * | | Wiki page revision comparison tool with diff displayed in modal dialog. ↵Andrew Manning2016-06-171-1/+43
| | | | | | | | | | | | | | | | Leverages Diff class from http://code.stephenmorley.org/php/diff-implementation with license CC0 1.0 universal http://creativecommons.org/publicdomain/zero/1.0/legalcode
* | | | 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 ↵Andrew Manning2016-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | JavaScript code injection.
| * | | | 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 ↵redmatrix2016-05-121-0/+10
| | | | | | | | | | | | | | | | | | | | stream but may be visible in feeds
* | | | | 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 ↵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
| |_|_|/ |/| | |
* | | | core changes to better support media migrationsredmatrix2016-06-163-8/+33
| |_|/ |/| |
* | | 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
|\ \ \ | | | | | | | | 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.
* | | | 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 ↵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 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.
* | | 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 ↵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
|\| |