aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* hubloc confusion during magic auth where hublocs with more than one network m...zotlabs2019-04-246-28/+90
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-2420-592/+1242
|\
| * Merge branch 'dev' into 'dev'Mario2019-04-241-14/+21
| |\
| | * Optimize cached photos processingMax Kostikov2019-04-241-11/+13
| | * Add modified date in Etag hash calculationMax Kostikov2019-04-241-3/+8
| * | calendar merge: bring back event categoriesMario Vavti2019-04-244-33/+52
| * | Merge branch 'update-docs' into 'dev'Max Kostikov2019-04-221-105/+164
| |\ \
| | * | Tidy up various bits of documentationDaniel Lowe2019-04-221-87/+163
| | * | Remove section on techlevelsDaniel Lowe2019-04-221-18/+1
| * | | Merge branch 'fix-infinite-loop' into 'dev'Max Kostikov2019-04-221-12/+6
| |\ \ \ | | |/ / | |/| |
| | * | Fix infinite loop using postgres as backendDaniel Lowe2019-04-211-12/+6
| |/ /
| * | Merge branch 'calendar_merge' into 'dev'Max Kostikov2019-04-2010-52/+872
| |\ \
| | * \ resolve merge conflictMario Vavti2019-04-203-2/+3
| | |\ \ | | |/ / | |/| |
| * | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-191-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Add anti SEO link properties in directory listingMax Kostikov2019-04-191-1/+1
| * | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-191-2/+2
| |\| |
| | * | Update cdav_calendar.tplMax Kostikov2019-04-191-2/+2
| * | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-191-0/+1
| |\| |
| | * | Add translation to update buttonMax Kostikov2019-04-191-0/+1
| * | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-191-1/+1
| |\| |
| | * | Add translation to update buttonMax Kostikov2019-04-191-1/+1
| | | * Merge branch 'dev' into calendar_mergeMario Vavti2019-04-192-6/+33
| | | |\ | | |_|/ | |/| |
| * | | Merge branch 'dev' into 'dev'Mario2019-04-192-6/+33
| |\| |
| | * | Add remove profile photo buttonMax Kostikov2019-04-191-4/+30
| | * | Add remove profile photo buttonMax Kostikov2019-04-191-2/+3
| | | * provide location and description informationMario Vavti2019-04-192-6/+13
| | | * provide link to source and some cleanupMario Vavti2019-04-195-145/+17
| | | * Merge branch 'dev' into calendar_mergeMario Vavti2019-04-197-407/+135
| | | |\ | | |_|/ | |/| |
| * | | Merge branch 'dev' into 'dev'Mario2019-04-191-1/+1
| |\ \ \
| * \ \ \ Merge branch 'dev' into 'dev'Mario2019-04-191-30/+13
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Update Photo.phpMax Kostikov2019-04-181-1/+1
| | * | | Update Photo.phpMax Kostikov2019-04-181-2/+4
| | * | | Implement ETag: header support for cache controlMax Kostikov2019-04-181-15/+14
| | * | | Add 'must-revalidate' to Cache-control header for profile photosMax Kostikov2019-04-171-1/+4
| | * | | Precise 'Modified:' header processing if no profile photo added; remove dupli...Max Kostikov2019-04-171-29/+8
| * | | | Merge branch 'homeinstall_certbot' into 'dev'Mario2019-04-193-374/+114
| |\ \ \ \
| | * | | | Letsencrypt: replaced dehydrated by certbot. Backup: replaced rsnaphsot by rs...OJ Random2019-04-153-374/+114
| | | | | * calendar merge initial commitMario Vavti2019-04-197-49/+990
* | | | | | Merge branch 'dev' of ../hm into devzotlabs2019-04-181-1/+1
|\ \ \ \ \ \
| * | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-182-12/+6
| |\| | | | | | | |_|_|/ / | |/| | | |
| | * | | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-182-2/+7
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | required php version not available but allowed to continuezotlabs2019-04-181-1/+1
| | |/ / / | |/| | |
| * | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-15156-14399/+42049
| |\ \ \ \ | | | |/ / | | |/| |
* | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-162-12/+6
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-161-1/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fix file path with filesystem storageMax Kostikov2019-04-161-1/+1
| * | | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-161-11/+5
| |\| | | | | |_|/ | |/| |
| | * | Use base image content instead of os_path; fix base images statsMax Kostikov2019-04-161-11/+5
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-15156-14399/+42049
|\| | | | |_|/ |/| |
| * | Merge branch 'dev' into 'dev'Mario2019-04-151-37/+58
| |\ \ | | |/ | |/|