aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
...
| | | * Merge branch 'dev' into sabre32Mario Vavti2016-06-292-2/+5
| | | |\
| | | * \ Merge branch 'dev' into sabre32Mario Vavti2016-06-288-10/+86
| | | |\ \
| | | * \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-2727-27/+72
| | | |\ \ \
| | | * \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-261-21/+25
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-2411-73/+244
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-232-10/+19
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ erge branch 'dev' into sabre32Mario Vavti2016-06-226-7/+751
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-212-24/+46
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-201-2/+2
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-181-2/+2
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-162-4/+52
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-154-9/+149
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-1413-80/+86
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-132-15/+183
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-103-0/+455
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | added permissionrolesredmatrix2016-06-272-30/+72
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' into permsredmatrix2016-06-2755-244/+2058
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | 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
| |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | 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
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | |