aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-134-24/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-102-0/+471
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | more style workMario Vavti2016-06-091-1/+1
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Replace homemade table of content generator with existing jQuery plugin. Now ↵Andrew Manning2016-06-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | toc is linked to document headings.
* | | | | | | | | | | | | | | | | | Added table of contents generator. Table is inserted wherever [toc] is ↵Andrew Manning2016-06-261-1/+75
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | encountered.
* | | | | | | | | | | | | | | | | Merge pull request #441 from Treer/cdnhubzilla2016-06-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix absolute .js urls
| * | | | | | | | | | | | | | | | | fix absolute .js urlsTreer2016-06-261-1/+1
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #438 from anaqreon/wikihubzilla2016-06-261-4/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | Wiki post generation option and image embed tool
| * | | | | | | | | | | | | | | | | A page name wrapped in double brackets is converted into a link to another ↵Andrew Manning2016-06-251-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | page in the current wiki
| * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-259-120/+80
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Post generation about new wiki is optional, default is NOT to post. Fixed ↵Andrew Manning2016-06-251-4/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug in wiki creation. Added embed image dialog and album browser.
* | | | | | | | | | | | | | | | | Allow absolute links to css and js filesTreer2016-06-251-8/+20
| |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | media (e.g. video) files weren't being detected correctly in oembed, causing ↵redmatrix2016-06-251-9/+8
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the stream to try and load large videos (and failing)
* | | | | | | | | | | | | | | change AbConfig to use channel_id instead of channel_hash; which was a ↵redmatrix2016-06-233-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mistake in retrospect
* | | | | | | | | | | | | | | relocate the cache classredmatrix2016-06-233-72/+6
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | code cleanup for profile_photosredmatrix2016-06-231-20/+45
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | 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