aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-2512-81/+261
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | fix pdledit "list layouts"redmatrix2016-06-241-5/+5
| * | | | | | | | | | | | | | | | | | | | | | SuperCurl to provide a re-usable curl options stack and just change options t...redmatrix2016-06-232-1/+112
| * | | | | | | | | | | | | | | | | | | | | | change AbConfig to use channel_id instead of channel_hash; which was a mistak...redmatrix2016-06-234-20/+19
| * | | | | | | | | | | | | | | | | | | | | | relocate the cache classredmatrix2016-06-231-0/+46
| * | | | | | | | | | | | | | | | | | | | | | code cleanup for profile_photosredmatrix2016-06-234-47/+62
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | 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
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
* / | | | | | | | | | | | | | | | | | | | Post generation about new wiki is optional, default is NOT to post. Fixed bug...Andrew Manning2016-06-251-17/+14
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | provide a skeleton of the current CalDAVClient with lots of notes about how b...redmatrix2016-06-211-0/+739
* | | | | | | | | | | | | | | | | | | | channel homepage not providing content when javascript disabledredmatrix2016-06-211-0/+3
* | | | | | | | | | | | | | | | | | | | 1. provide automatic relocation of important links in items that are imported...redmatrix2016-06-214-7/+9
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | 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. Lever...Andrew Manning2016-06-171-2/+40
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | 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 JavaScri...Andrew Manning2016-06-121-15/+3
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | |
* | / | | | | | | | | | | | | | | | fix siteinfo plugin listredmatrix2016-06-201-2/+1
|/ / / / / / / / / / / / / / / / /
* | / / / / / / / / / / / / / / / "thing" always showing default url, not that supplied by the thing.redmatrix2016-06-171-2/+2
| |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-155-9/+151
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | translate already imported system appsredmatrix2016-06-151-0/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | support cookie auth in Sabre DAVredmatrix2016-06-142-1/+55
| * | | | | | | | | | | | | | | readme for the module directory, also provide an undocumented way to reset th...redmatrix2016-06-142-8/+94
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* / | | | | | | | | | | | | | Rename page feature added. Fixed bug in git commit function and other minor f...Andrew Manning2016-06-151-4/+50
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | some work to provide propagation and honouring of the item_notshown flag.redmatrix2016-06-131-2/+2
* | | | | | | | | | | | | | deprecate the item_id table - replace with iconfig. A possibly useful functio...redmatrix2016-06-1312-78/+84
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #416 from anaqreon/embedphotoshubzilla2016-06-131-0/+180
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Photo embed button with album browser works in new post editor.Andrew Manning2016-06-121-0/+180
| |/ / / / / / / / / / / /
* / / / / / / / / / / / / Apply purify_html to page content before preview and save to prevent JavaScri...Andrew Manning2016-06-121-15/+3
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #410 from anaqreon/wikihubzilla2016-06-103-0/+455
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-092-5/+9
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Revised permissions checks across API and enabled collaborative editing using...Andrew Manning2016-06-081-79/+60
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-085-1/+424
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-074-53/+258
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Hide page history viewer when viewing sandboxAndrew Manning2016-06-051-1/+4
| * | | | | | | | | | | | | Custom commit message available. Improved history viewer and feedback from re...Andrew Manning2016-06-051-1/+10
| * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Basic page reversion implemented. The revert button on the history view repla...Andrew Manning2016-06-051-0/+35
| * | | | | | | | | | | | | Page deletion implemented. Hide the delete button and disallow for Home page.Andrew Manning2016-06-041-4/+51
| * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-041-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Wiki and page filenames are abstracted from their displayed names. Special ch...Andrew Manning2016-06-041-20/+22
| * | | | | | | | | | | | | | Created three distinct names for wiki and page that are suitable for URL, HTM...Andrew Manning2016-06-041-6/+10
| * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-043-6/+68
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \