| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-28 | 8 | -10/+86 |
|\ |
|
| * | still working through some issues with curl magic-auth | redmatrix | 2016-06-27 | 4 | -6/+23 |
| * | provide a daemon for implementing zot magic-auth over curl. | redmatrix | 2016-06-27 | 1 | -0/+52 |
| * | add letsencrypt x3 intermediate cert and new cert file, improve UX of new reg... | redmatrix | 2016-06-27 | 1 | -1/+2 |
| * | replace [+] and [-] with chevron icons | redmatrix | 2016-06-27 | 1 | -1/+1 |
| * | comment on the setup page about the possible need for intermediate certs. | redmatrix | 2016-06-27 | 2 | -4/+10 |
* | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-27 | 27 | -27/+72 |
|\| |
|
| * | fix for the rendering side of issue #412. We traditionally store all | redmatrix | 2016-06-26 | 1 | -1/+1 |
| * | remove the app $a passed to profile_load, also add profile_load to mod_wiki w... | redmatrix | 2016-06-26 | 26 | -26/+28 |
| * | document the daemon classes | redmatrix | 2016-06-26 | 1 | -0/+43 |
* | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-26 | 1 | -21/+25 |
|\| |
|
| * | A page name wrapped in double brackets is converted into a link to another pa... | Andrew Manning | 2016-06-25 | 1 | -4/+11 |
| * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-25 | 12 | -81/+261 |
| |\ |
|
| * | | Post generation about new wiki is optional, default is NOT to post. Fixed bug... | Andrew Manning | 2016-06-25 | 1 | -17/+14 |
* | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-24 | 11 | -73/+244 |
|\ \ \
| | |/
| |/| |
|
| * | | fix pdledit "list layouts" | redmatrix | 2016-06-24 | 1 | -5/+5 |
| * | | SuperCurl to provide a re-usable curl options stack and just change options t... | redmatrix | 2016-06-23 | 2 | -1/+112 |
| * | | change AbConfig to use channel_id instead of channel_hash; which was a mistak... | redmatrix | 2016-06-23 | 4 | -20/+19 |
| * | | relocate the cache class | redmatrix | 2016-06-23 | 1 | -0/+46 |
| * | | code cleanup for profile_photos | redmatrix | 2016-06-23 | 4 | -47/+62 |
* | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-23 | 2 | -10/+19 |
|\| | |
|
| * | | set profile when "use existing photo" | redmatrix | 2016-06-22 | 1 | -4/+14 |
| * | | missing class selector when "use photo as profile photo" | redmatrix | 2016-06-22 | 1 | -1/+1 |
| * | | db statement debugging | redmatrix | 2016-06-22 | 2 | -5/+4 |
| |/ |
|
* | | erge branch 'dev' into sabre32 | Mario Vavti | 2016-06-22 | 6 | -7/+751 |
|\| |
|
| * | provide a skeleton of the current CalDAVClient with lots of notes about how b... | redmatrix | 2016-06-21 | 1 | -0/+739 |
| * | channel homepage not providing content when javascript disabled | redmatrix | 2016-06-21 | 1 | -0/+3 |
| * | 1. provide automatic relocation of important links in items that are imported... | redmatrix | 2016-06-21 | 4 | -7/+9 |
* | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-21 | 2 | -24/+46 |
|\| |
|
| * | code optimisation | redmatrix | 2016-06-20 | 1 | -21/+5 |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-06-20 | 2 | -4/+43 |
| |\ |
|
| | * | Merge pull request #429 from anaqreon/wiki | hubzilla | 2016-06-21 | 1 | -2/+41 |
| | |\ |
|
| | | * | Add formatted heading for revision comparison viewer | Andrew Manning | 2016-06-20 | 1 | -1/+2 |
| | | * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-20 | 1 | -2/+2 |
| | | |\ |
|
| | | * | | Wiki page revision comparison tool with diff displayed in modal dialog. Lever... | Andrew Manning | 2016-06-17 | 1 | -2/+40 |
| * | | | | fix siteinfo plugin list | redmatrix | 2016-06-20 | 1 | -2/+1 |
| | |_|/
| |/| | |
|
* | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-20 | 1 | -2/+2 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Merge branch 'master' into dev | Mario Vavti | 2016-06-20 | 1 | -2/+2 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | missing backslash leading to wsod on xconfig changes | Mario Vavti | 2016-06-20 | 1 | -2/+2 |
| | * | | "thing" always showing default url, not that supplied by the thing. | redmatrix | 2016-06-17 | 1 | -2/+2 |
| | * | | translate already imported system apps | redmatrix | 2016-06-15 | 1 | -0/+2 |
| | * | | Apply purify_html to page content before preview and save to prevent JavaScri... | Andrew Manning | 2016-06-12 | 1 | -15/+3 |
* | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-18 | 1 | -2/+2 |
|\| | | |
|
| * | | | "thing" always showing default url, not that supplied by the thing. | redmatrix | 2016-06-17 | 1 | -2/+2 |
| | |/
| |/| |
|
* | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-16 | 2 | -4/+52 |
|\| | |
|
| * | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-15 | 5 | -9/+151 |
| |\ \ |
|
| | * | | translate already imported system apps | redmatrix | 2016-06-15 | 1 | -0/+2 |
| * | | | Rename page feature added. Fixed bug in git commit function and other minor f... | Andrew Manning | 2016-06-15 | 1 | -4/+50 |
* | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-15 | 4 | -9/+149 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | support cookie auth in Sabre DAV | redmatrix | 2016-06-14 | 2 | -1/+55 |