aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* wiki featured disabled by default in UNO.redmatrix2016-06-291-1/+1
|
* provide wiki as a feature (default is on so there aren't any surprises) and ↵redmatrix2016-06-293-5/+14
| | | | add to channel menu and profile tabs
* stream large photos through buffered I/O if possibleredmatrix2016-06-291-1/+1
|
* Merge branch 'dev' into sabre32Mario Vavti2016-06-291-0/+38
|\
| * identity_export_year() was a bit short-sighted. We really require arbitrary ↵redmatrix2016-06-281-0/+38
| | | | | | | | date ranges. A new function was created to tackle this - channel_export_items() which takes a channel, and a start and finish date. Finish date will default to "now" if not set. Will be working this into the interface under a module named "export_items" which will correspond closely to the existing "import_items" module you'll need to do the reverse operation. Will also make it available via the API. Once that is complete, I anticipate removing identity_export_year() as it will then be somewhat redundant, and modifying the documentation on the channel export page accordingly. Note: the function works strictly in GMT so an interface would need to convert from channel local time.
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-284-7/+30
|\|
| * still working through some issues with curl magic-authredmatrix2016-06-271-0/+7
| | | | | | | | fixed profile photo upload
| * add letsencrypt x3 intermediate cert and new cert file, improve UX of new ↵redmatrix2016-06-272-3/+19
| | | | | | | | registrations
| * replace [+] and [-] with chevron iconsredmatrix2016-06-271-4/+4
| |
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-273-3/+26
|\|
| * remove the app $a passed to profile_load, also add profile_load to mod_wiki ↵redmatrix2016-06-261-2/+1
| | | | | | | | which should fix issue #431
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-06-262-12/+42
| |\
| * | issue #442, tables contain too much whitespace (there's a definite issue ↵redmatrix2016-06-262-1/+25
| | | | | | | | | | | | here, but I should note the offending example was full of carriage returns as well as linefeeds; which exacerbated the problem).
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-262-12/+42
|\ \ \ | | |/ | |/|
| * | 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
| | |/ | |/|
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-251-9/+8
|\| |
| * | 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)
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-247-104/+62
|\| |
| * | 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
| | |
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-234-7/+10
|\| |
| * | 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.
* | erge branch 'dev' into sabre32Mario Vavti2016-06-225-46/+61
|\|
| * 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
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-215-12/+53
|\|
| * 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 '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 ↵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
| | | | | |