aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-104-19/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-086-10/+429
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-071-43/+63
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-062-1/+190
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-054-10/+22
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-032-7/+103
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-0225-196/+189
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-0121-184/+66
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-05-313-5/+171
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-05-302-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | upgrade to sabre32Mario Vavti2016-05-281-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | missing backslash leads to wsod on refresh permissionsMario Vavti2016-06-291-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | readabilityredmatrix2016-06-281-1/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | identity_export_year() was a bit short-sighted. We really require arbitrary d...redmatrix2016-06-281-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | still working through some issues with curl magic-authredmatrix2016-06-274-6/+23
| * | | | | | | | | | | | | | | | | | | | | | | | | 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 reg...redmatrix2016-06-271-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | fix for the rendering side of issue #412. We traditionally store allredmatrix2016-06-261-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | remove the app $a passed to profile_load, also add profile_load to mod_wiki w...redmatrix2016-06-2626-26/+28
| * | | | | | | | | | | | | | | | | | | | | | | | document the daemon classesredmatrix2016-06-261-0/+43
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Replace homemade table of content generator with existing jQuery plugin. Now ...Andrew Manning2016-06-301-4/+2
* | | | | | | | | | | | | | | | | | | | | | | | Fixed bug with rendering table of contents upon page loadAndrew Manning2016-06-261-2/+3
* | | | | | | | | | | | | | | | | | | | | | | | Also generate table of contents when loading the pageAndrew Manning2016-06-261-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | Added table of contents generator. Table is inserted wherever [toc] is encoun...Andrew Manning2016-06-261-0/+1
|/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | A page name wrapped in double brackets is converted into a link to another pa...Andrew Manning2016-06-251-4/+11
* | | | | | | | | | | | | | | | | | | | | | | 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