aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into sabre32Mario Vavti2016-06-288-10/+86
|\
| * still working through some issues with curl magic-authredmatrix2016-06-274-6/+23
| | | | | | | | fixed profile photo upload
| * provide a daemon for implementing zot magic-auth over curl.redmatrix2016-06-271-0/+52
| |
| * add letsencrypt x3 intermediate cert and new cert file, improve UX of new ↵redmatrix2016-06-271-1/+2
| | | | | | | | registrations
| * replace [+] and [-] with chevron iconsredmatrix2016-06-271-1/+1
| |
| * comment on the setup page about the possible need for intermediate certs.redmatrix2016-06-272-4/+10
| |
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-2727-27/+72
|\|
| * fix for the rendering side of issue #412. We traditionally store allredmatrix2016-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | "user generated" content with ENT_COMPAT encoding to reduce the attack vector for JS CSS exploits. This may present compatibility issues sharing wikis to platforms which do not provide such CSS protection. We can either decide that wikis are inherently insecure and filter them on render (with an associated performance penalty), or keep the existing method of filtering on store. I'm not making that choice. I'm merely fixing the obvious rendering issue in mono-platform viewing.
| * remove the app $a passed to profile_load, also add profile_load to mod_wiki ↵redmatrix2016-06-2626-26/+28
| | | | | | | | which should fix issue #431
| * document the daemon classesredmatrix2016-06-261-0/+43
| |
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-261-21/+25
|\|
| * A page name wrapped in double brackets is converted into a link to another ↵Andrew Manning2016-06-251-4/+11
| | | | | | | | page in the current wiki
| * Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-2512-81/+261
| |\
| * | Post generation about new wiki is optional, default is NOT to post. Fixed ↵Andrew Manning2016-06-251-17/+14
| | | | | | | | | | | | bug in wiki creation. Added embed image dialog and album browser.
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-2411-73/+244
|\ \ \ | | |/ | |/|
| * | fix pdledit "list layouts"redmatrix2016-06-241-5/+5
| | |
| * | SuperCurl to provide a re-usable curl options stack and just change options ↵redmatrix2016-06-232-1/+112
| | | | | | | | | | | | that are different from one call to the next
| * | change AbConfig to use channel_id instead of channel_hash; which was a ↵redmatrix2016-06-234-20/+19
| | | | | | | | | | | | mistake in retrospect
| * | relocate the cache classredmatrix2016-06-231-0/+46
| | |
| * | code cleanup for profile_photosredmatrix2016-06-234-47/+62
| | |
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-232-10/+19
|\| |
| * | set profile when "use existing photo"redmatrix2016-06-221-4/+14
| | |
| * | missing class selector when "use photo as profile photo"redmatrix2016-06-221-1/+1
| | |
| * | db statement debuggingredmatrix2016-06-222-5/+4
| |/
* | erge branch 'dev' into sabre32Mario Vavti2016-06-226-7/+751
|\|
| * provide a skeleton of the current CalDAVClient with lots of notes about how ↵redmatrix2016-06-211-0/+739
| | | | | | | | best to move forward just in case anybody is feeling ambitious or anxious.
| * channel homepage not providing content when javascript disabledredmatrix2016-06-211-0/+3
| |
| * 1. provide automatic relocation of important links in items that are ↵redmatrix2016-06-214-7/+9
| | | | | | | | | | | | | | 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-212-24/+46
|\|
| * code optimisationredmatrix2016-06-201-21/+5
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-06-202-4/+43
| |\
| | * Merge pull request #429 from anaqreon/wikihubzilla2016-06-211-2/+41
| | |\ | | | | | | | | Wiki page revision comparison viewer
| | | * Add formatted heading for revision comparison viewerAndrew Manning2016-06-201-1/+2
| | | |
| | | * Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-201-2/+2
| | | |\
| | | * | Wiki page revision comparison tool with diff displayed in modal dialog. ↵Andrew Manning2016-06-171-2/+40
| | | | | | | | | | | | | | | | | | | | 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
| * | | | fix siteinfo plugin listredmatrix2016-06-201-2/+1
| | |_|/ | |/| |
* | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-201-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' into devMario Vavti2016-06-201-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | missing backslash leading to wsod on xconfig changesMario Vavti2016-06-201-2/+2
| | | |
| | * | "thing" always showing default url, not that supplied by the thing.redmatrix2016-06-171-2/+2
| | | |
| | * | translate already imported system appsredmatrix2016-06-151-0/+2
| | | |
| | * | Apply purify_html to page content before preview and save to prevent ↵Andrew Manning2016-06-121-15/+3
| | | | | | | | | | | | | | | | JavaScript code injection.
* | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-181-2/+2
|\| | |
| * | | "thing" always showing default url, not that supplied by the thing.redmatrix2016-06-171-2/+2
| | |/ | |/|
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-162-4/+52
|\| |
| * | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-155-9/+151
| |\ \
| | * | translate already imported system appsredmatrix2016-06-151-0/+2
| | | |
| * | | Rename page feature added. Fixed bug in git commit function and other minor ↵Andrew Manning2016-06-151-4/+50
| | | | | | | | | | | | | | | | fixes.
* | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-154-9/+149
|\ \ \ \ | | |/ / | |/| |
| * | | support cookie auth in Sabre DAVredmatrix2016-06-142-1/+55
| | | |