aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \
| | * | required php version not available but allowed to continuezotlabs2019-04-181-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
| * | | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-182-2/+7
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-15156-14399/+42049
| | |\| |
| | * | | add attachments to zot6 event objects, add zot6 to federated transports (webf...zotlabs2019-04-152-2/+7
* | | | | calendar merge initial commitMario Vavti2019-04-197-49/+990
|/ / / /
* | | | 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' into 'dev'Mario2019-04-151-37/+58
|\ \ \ | |/ / |/| |
| * | Extending GitLab CI/CD.Klaus Weidenbach2019-04-131-37/+58
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-151-1/+1
|\ \ \
| * | | Update INSTALL.txtMax Kostikov2019-04-151-1/+1
* | | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-153-14110/+14263
|\| | |
| * | | Update Russian hstrings.phpMax Kostikov2019-04-151-2785/+2792
| * | | Update Russian hmessages.poMax Kostikov2019-04-151-11324/+11470
| * | | Fix space in plurals regexpMax Kostikov2019-04-151-1/+1
* | | | Add command line tool for thumbnails storage convertionMax Kostikov2019-04-141-0/+137
* | | | Merge branch 'dev' into 'dev'Mario2019-04-136-81/+137
|\| | | | |/ / |/| |
| * | Update photo usage only for thumbnailsMax Kostikov2019-04-131-1/+1
| * | Update xchan profile edited date only onceMax Kostikov2019-04-131-9/+10
| * | Set 'os_syspath' with local pathMax Kostikov2019-04-121-1/+2
| * | Override received 'content' if we saving thumbnail in filesystemMax Kostikov2019-04-121-0/+1
| * | Add multiple profiles support on image operations in photo driverMax Kostikov2019-04-121-5/+8
| * | Fix 'os_syspath' if we store thumbnails in filesystemMax Kostikov2019-04-121-1/+3