Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'revert-6375f2d7' into 'dev' | Max Kostikov | 2018-11-13 | 1 | -9/+6 |
|\ | | | | | | | | | Revert "Replace fetch_image_from_url() with z_fetch_url()" See merge request hubzilla/core!1392 | ||||
| * | Revert "Replace fetch_image_from_url() with z_fetch_url()" | Max Kostikov | 2018-11-13 | 1 | -9/+6 |
|/ | | | This reverts commit 6375f2d73a0c314e8de12071f1e604e59d8c76de | ||||
* | Replace fetch_image_from_url() with z_fetch_url() | Max Kostikov | 2018-11-13 | 1 | -6/+9 |
| | |||||
* | Merge branch 'fix-activity-filter-widget' into 'dev' | M. Dent | 2018-11-12 | 1 | -1/+1 |
|\ | | | | | | | | | use the correct javascript function for this case See merge request hubzilla/core!1390 | ||||
| * | use the correct javascript function for this case | Mario Vavti | 2018-11-11 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'css-fixes' into 'dev' | M. Dent | 2018-11-12 | 3 | -12/+8 |
|\ \ | |/ |/| | | | | | css fixes See merge request hubzilla/core!1391 | ||||
| * | fix css issues in bbcode conversion and focus-light schema | Mario Vavti | 2018-11-12 | 3 | -12/+8 |
|/ | |||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-11-11 | 3 | -14/+18 |
|\ | |||||
| * | Merge branch 'dev' into 'dev' | Mario | 2018-11-11 | 2 | -5/+9 |
| |\ | | | | | | | | | | | | | Preserve photo modification date on edit See merge request hubzilla/core!1389 | ||||
| | * | Merge branch 'dev' into 'dev' | Max Kostikov | 2018-11-10 | 1 | -9/+9 |
| | |\ | | | | | | | | | | | | | # Conflicts: # include/photo/photo_driver.php | ||||
| | * | | Update photo_driver.php | Max Kostikov | 2018-11-10 | 1 | -1/+1 |
| | | | | |||||
| | * | | Preserve photo modification date | Max Kostikov | 2018-11-10 | 1 | -4/+8 |
| | | | | |||||
| | * | | Fixed wrong value assign on compare with 0 | Max Kostikov | 2018-11-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'dev' into 'dev' | Mario | 2018-11-11 | 1 | -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' | Mario | 2018-11-10 | 1 | -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 Manning | 2018-11-09 | 1 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | friction with Docker deployment. | ||||
* | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-11-10 | 3 | -16/+20 |
|\| | | | | |_|/ / |/| | | | |||||
| * | | | Fixed wrong value assign on compare with 0 | Max Kostikov | 2018-11-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'dev' into 'dev' | Mario | 2018-11-10 | 3 | -15/+19 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Preserve received image modification date on caching See merge request hubzilla/core!1386 | ||||
| | * | | Do not return default images from vCard | Max Kostikov | 2018-11-10 | 1 | -1/+0 |
| | | | | |||||
| | * | | Remove unnecessary Zulu timezone mention | Max Kostikov | 2018-11-10 | 1 | -1/+1 |
| | | | | |||||
| | * | | Preserve received image modification date on caching | Max Kostikov | 2018-11-09 | 1 | -11/+16 |
| | | | | |||||
| | * | | Fixed timezone conversion | Max Kostikov | 2018-11-09 | 1 | -4/+4 |
| |/ / | |||||
* / / | fix shared_header img expanding to 100% width when sharing a share | Mario Vavti | 2018-11-10 | 1 | -5/+2 |
|/ / | |||||
* | | Merge branch 'patch-1' into 'dev' | Mario | 2018-11-09 | 1 | -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 headers | Max Kostikov | 2018-11-08 | 1 | -23/+7 |
| | | |||||
| * | Return image modification date using HTTP 'Last-Modified' and '304 Not ↵ | Max Kostikov | 2018-11-08 | 1 | -115/+159 |
| | | | | | | | | Modified' on remote fetch for caching | ||||
* | | Workaround for local resource path to photo from Diaspora | Max Kostikov | 2018-11-09 | 1 | -0/+1 |
|/ | |||||
* | Merge branch 'fix-photo' into 'dev' | M. Dent | 2018-11-08 | 1 | -1/+1 |
|\ | | | | | | | | | Fix photo See merge request hubzilla/core!1382 | ||||
| * | Merge branch 'patch-1' into 'fix-photo' | Mario | 2018-11-08 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Correct "Content-Length:" calculation added See merge request mario/core!1 | ||||
| | * | Correct "Content-Length:" calculation added | Max Kostikov | 2018-11-08 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'fix-photo' into 'dev' | M. Dent | 2018-11-08 | 1 | -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 Vavti | 2018-11-08 | 1 | -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' | Mario | 2018-11-08 | 1 | -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 enabled | Max Kostikov | 2018-11-07 | 1 | -6/+6 |
| | | |||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-11-08 | 1 | -6/+14 |
|\| | |||||
| * | Merge branch 'patch-1' into 'dev' | M. Dent | 2018-11-07 | 1 | -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 Kostikov | 2018-11-07 | 1 | -6/+14 |
| |/ | | | | | | | absent 404 for photos | ||||
* | | provide a function to log to syslog | Mario Vavti | 2018-11-08 | 1 | -0/+13 |
| | | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-11-07 | 3 | -45/+95 |
|\ \ | |||||
| * | | signature issue | zotlabs | 2018-11-06 | 1 | -1/+1 |
| | | | |||||
| * | | these changes needed to ensure cloning/syncing works in the future to ↵ | zotlabs | 2018-11-05 | 2 | -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.php | Mario Vavti | 2018-11-07 | 1 | -2/+2 |
| |/ |/| | |||||
* | | Merge branch 'revert-40d9277e' into 'dev' | Mario | 2018-11-07 | 1 | -1/+2 |
|\ \ | | | | | | | | | | | | | Revert "remove 'Expiries' HTTP header" See merge request hubzilla/core!1372 | ||||
| * | | Revert "remove 'Expiries' HTTP header" | Max Kostikov | 2018-11-07 | 1 | -1/+2 |
|/ / | | | | | This reverts commit 40d9277ef38ef1200db59cd2f8c6b9e2a80bc332 | ||||
* | | Merge branch 'patch-25' into 'dev' | M. Dent | 2018-11-06 | 1 | -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 Kostikov | 2018-11-06 | 1 | -2/+1 |
| | | | |||||
| * | | Update Photo.php | Max Kostikov | 2018-11-06 | 1 | -2/+2 |
| | | | |||||
| * | | Update Photo.php | Max Kostikov | 2018-11-06 | 1 | -4/+2 |
| | | | |||||
| * | | Update Photo.php | Max Kostikov | 2018-11-06 | 1 | -2/+3 |
| | | |