aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-activity-filter-widget' into 'dev'M. Dent2018-11-121-1/+1
|\
| * use the correct javascript function for this caseMario Vavti2018-11-111-1/+1
* | Merge branch 'css-fixes' into 'dev'M. Dent2018-11-123-12/+8
|\ \ | |/ |/|
| * 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
| |\
| | * Merge branch 'dev' into 'dev'Max Kostikov2018-11-101-9/+9
| | |\
| | * | 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
| |\ \ \ | | |_|/ | |/| |
| * | | Merge branch 'dev' into 'dev'Mario2018-11-101-9/+9
| |\ \ \
| | * | | Remove DNS check for database connection during installation. Causes friction...Andrew Manning2018-11-091-9/+9
* | | | | 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
| |\ \ \ | | | |/ | | |/|
| | * | 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
|\ \ | |/ |/|
| * 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 Modifi...Max Kostikov2018-11-081-115/+159
* | 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
|\
| * Merge branch 'patch-1' into 'fix-photo'Mario2018-11-081-1/+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 ...Mario Vavti2018-11-081-1/+2
|/
* Merge branch 'patch-1' into 'dev'Mario2018-11-081-6/+6
|\
| * 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 a...Max Kostikov2018-11-071-6/+14
| |/
* | 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 non-zot...zotlabs2018-11-052-44/+94
* | | 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"Max Kostikov2018-11-071-1/+2
|/ /
* | Merge branch 'patch-25' into 'dev'M. Dent2018-11-061-13/+20
|\ \
| * | 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
|\ \ \ | |/ / |/| |
| * | Update hmessages.poMax Kostikov2018-11-061-1/+1