aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'css-fixes' into 'dev'M. Dent2018-11-123-12/+8
|\ | | | | | | | | css fixes See merge request hubzilla/core!1391
| * fix css issues in bbcode conversion and focus-light schemaMario Vavti2018-11-123-12/+8
|/
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-11-113-14/+18
|\
| * Merge branch 'dev' into 'dev'Mario2018-11-112-5/+9
| |\ | | | | | | | | | | | | Preserve photo modification date on edit See merge request hubzilla/core!1389
| | * Merge branch 'dev' into 'dev'Max Kostikov2018-11-101-9/+9
| | |\ | | | | | | | | | | | | # Conflicts: # include/photo/photo_driver.php
| | * | Update photo_driver.phpMax Kostikov2018-11-101-1/+1
| | | |
| | * | Preserve photo modification dateMax Kostikov2018-11-101-4/+8
| | | |
| | * | Fixed wrong value assign on compare with 0Max Kostikov2018-11-101-1/+1
| | | |
| * | | Merge branch 'dev' into 'dev'Mario2018-11-111-5/+2
| |\ \ \ | | |_|/ | |/| | | | | | | | | | fix shared_header img expanding to 100% width when sharing a share See merge request hubzilla/core!1387
| * | | Merge branch 'dev' into 'dev'Mario2018-11-101-9/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Remove DNS check for database connection during installation... See merge request hubzilla/core!1384
| | * | | Remove DNS check for database connection during installation. Causes ↵Andrew Manning2018-11-091-9/+9
| | | | | | | | | | | | | | | | | | | | friction with Docker deployment.
* | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-11-103-16/+20
|\| | | | | |_|/ / |/| | |
| * | | Fixed wrong value assign on compare with 0Max Kostikov2018-11-101-1/+1
| | | |
| * | | Merge branch 'dev' into 'dev'Mario2018-11-103-15/+19
| |\ \ \ | | | |/ | | |/| | | | | | | | | Preserve received image modification date on caching See merge request hubzilla/core!1386
| | * | Do not return default images from vCardMax Kostikov2018-11-101-1/+0
| | | |
| | * | Remove unnecessary Zulu timezone mentionMax Kostikov2018-11-101-1/+1
| | | |
| | * | Preserve received image modification date on cachingMax Kostikov2018-11-091-11/+16
| | | |
| | * | Fixed timezone conversionMax Kostikov2018-11-091-4/+4
| |/ /
* / / fix shared_header img expanding to 100% width when sharing a shareMario Vavti2018-11-101-5/+2
|/ /
* | Merge branch 'patch-1' into 'dev'Mario2018-11-091-128/+156
|\ \ | |/ |/| | | | | Return image modification date on remote fetch for caching See merge request hubzilla/core!1383
| * remove image type double guess by checking HTTP headersMax Kostikov2018-11-081-23/+7
| |
| * Return image modification date using HTTP 'Last-Modified' and '304 Not ↵Max Kostikov2018-11-081-115/+159
| | | | | | | | Modified' on remote fetch for caching
* | Workaround for local resource path to photo from DiasporaMax Kostikov2018-11-091-0/+1
|/
* Merge branch 'fix-photo' into 'dev'M. Dent2018-11-081-1/+1
|\ | | | | | | | | Fix photo See merge request hubzilla/core!1382
| * Merge branch 'patch-1' into 'fix-photo'Mario2018-11-081-1/+1
| |\ | | | | | | | | | | | | Correct "Content-Length:" calculation added See merge request mario/core!1
| | * Correct "Content-Length:" calculation addedMax Kostikov2018-11-081-1/+1
| |/
* | Merge branch 'fix-photo' into 'dev'M. Dent2018-11-081-1/+2
|\| | | | | | | | | $data only contains the link to the image if the image is in os storage. The… See merge request hubzilla/core!1379
| * $data only contains the link to the image if the image is in os storage. The ↵Mario Vavti2018-11-081-1/+2
|/ | | | size is calculatet wrong in this case and the download fails. rely on filesize from the db for content-length
* Merge branch 'patch-1' into 'dev'Mario2018-11-081-6/+6
|\ | | | | | | | | Disable image caching if personal or group permissions enabled See merge request hubzilla/core!1377
| * Disable image caching if personal or group permissions enabledMax Kostikov2018-11-071-6/+6
| |
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-11-081-6/+14
|\|
| * Merge branch 'patch-1' into 'dev'M. Dent2018-11-071-6/+14
| |\ | | | | | | | | | | | | Added `If-Modified-Since` header support for better image caching and fixed absent 404 for photos See merge request hubzilla/core!1375
| | * Added `If-Modified-Since` header support for better image caching and fixed ↵Max Kostikov2018-11-071-6/+14
| |/ | | | | | | absent 404 for photos
* | provide a function to log to syslogMario Vavti2018-11-081-0/+13
| |
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-11-073-45/+95
|\ \
| * | signature issuezotlabs2018-11-061-1/+1
| | |
| * | these changes needed to ensure cloning/syncing works in the future to ↵zotlabs2018-11-052-44/+94
| | | | | | | | | | | | non-zot6 enabled servers after the (coming) zot6 schema updates. This should probably be on a fast track to master branch
* | | fix es-es hstrings.phpMario Vavti2018-11-071-2/+2
| |/ |/|
* | Merge branch 'revert-40d9277e' into 'dev'Mario2018-11-071-1/+2
|\ \ | | | | | | | | | | | | Revert "remove 'Expiries' HTTP header" See merge request hubzilla/core!1372
| * | Revert "remove 'Expiries' HTTP header"Max Kostikov2018-11-071-1/+2
|/ / | | | | This reverts commit 40d9277ef38ef1200db59cd2f8c6b9e2a80bc332
* | Merge branch 'patch-25' into 'dev'M. Dent2018-11-061-13/+20
|\ \ | | | | | | | | | | | | 'Last-Modified' and 'Content-Length' HTTP headers added for better image caching See merge request hubzilla/core!1369
| * | remove 'Expiries' HTTP header Max Kostikov2018-11-061-2/+1
| | |
| * | Update Photo.phpMax Kostikov2018-11-061-2/+2
| | |
| * | Update Photo.phpMax Kostikov2018-11-061-4/+2
| | |
| * | Update Photo.phpMax Kostikov2018-11-061-2/+3
| | |
| * | 'Last-Modified' and 'Content-Length' HTTP headers added for better image cachingMax Kostikov2018-11-061-9/+18
| | |
* | | Merge branch 'patch-26' into 'dev'M. Dent2018-11-069-9/+9
|\ \ \ | |/ / |/| | | | | | | | New plural functions for JavaScript compatibility See merge request hubzilla/core!1370
| * | Update hmessages.poMax Kostikov2018-11-061-1/+1
| | |
| * | Update hmessages.poMax Kostikov2018-11-061-1/+1
| | |
| * | New pt-br plural function for JavaScript compatibilityMax Kostikov2018-11-061-1/+1
| | |