Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into 'dev' | Max Kostikov | 2018-12-04 | 3 | -420/+445 |
|\ | | | | | | | | | Add strings to Russian translation See merge request hubzilla/core!1418 | ||||
| * | Update hstrings.php | Max Kostikov | 2018-12-04 | 1 | -20/+26 |
| | | |||||
| * | Update hmessages.po | Max Kostikov | 2018-12-04 | 1 | -399/+418 |
| | | |||||
| * | Create plink depending on message id format | Max Kostikov | 2018-11-30 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-12-04 | 1 | -15/+12 |
|\ \ | |||||
| * \ | Merge branch 'photocache' into 'dev' | Mario | 2018-12-04 | 1 | -15/+12 |
| |\ \ | | | | | | | | | | | | | | | | | Less dependence on cache logic See merge request hubzilla/core!1417 | ||||
| | * | | Update Photo.php | Max Kostikov | 2018-12-03 | 1 | -1/+1 |
| | | | | |||||
| | * | | Update Photo.php | Max Kostikov | 2018-12-03 | 1 | -1/+1 |
| | | | | |||||
| | * | | Update Photo.php | Max Kostikov | 2018-12-03 | 1 | -1/+1 |
| | | | | |||||
| | * | | New logic for less dependence on cache logic | Max Kostikov | 2018-12-03 | 1 | -15/+12 |
| | | | | |||||
* | | | | partial solution for obj|tgt multiple (zot and zot6) encodings; the zot6 ↵ | zotlabs | 2018-12-03 | 3 | -0/+12 |
| | | | | | | | | | | | | | | | | version will be stored under $item['obj']['asld'] | ||||
* | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-12-03 | 86 | -1091/+3064 |
|\| | | | |||||
| * | | | quickfix for es-es language | Mario Vavti | 2018-12-03 | 1 | -2/+2 |
| | | | | | | | | | | | | (cherry picked from commit 6b68a76bbe2869c505e4c12d2b25ceb59d3ab813) | ||||
| * | | | changelog | Mario Vavti | 2018-12-03 | 1 | -0/+18 |
| | | | | | | | | | | | | (cherry picked from commit 88486a127849080222f5e6d5f8cb38af624413fe) | ||||
| * | | | more notifications fixes | Mario Vavti | 2018-12-03 | 3 | -6/+6 |
| | | | | | | | | | | | | (cherry picked from commit 9ef6c57ca59aa318a3564f6b48c6442870650d3e) | ||||
| * | | | catch exception if readImageBlob() receives bogus data | Mario Vavti | 2018-12-03 | 1 | -3/+7 |
| | | | | | | | | | | | | (cherry picked from commit 443d7684dbe8c1c3540df5aeb719403d67789747) | ||||
| * | | | Merge branch 'photocache' into 'dev' | Max Kostikov | 2018-12-03 | 1 | -13/+18 |
| |\| | | | | | | | | | | | | | | | | | | Add flag to allow to save image without validation See merge request hubzilla/core!1416 | ||||
| | * | | Add Expires field support | Max Kostikov | 2018-12-03 | 1 | -11/+16 |
| | | | | |||||
| | * | | Add flag to allow to save image without validation | Max Kostikov | 2018-12-02 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'photocache' into 'dev' | M. Dent | 2018-12-02 | 7 | -38/+132 |
| |\| | | | | | | | | | | | | | | | | | | Add Photo Cache addon support See merge request hubzilla/core!1412 | ||||
| | * | | Remove local_channel() check on cache_body_hook call | Max Kostikov | 2018-12-02 | 1 | -9/+7 |
| | | | | |||||
| | * | | Check local_channel() before cache call | Max Kostikov | 2018-11-30 | 1 | -6/+8 |
| | | | | |||||
| | * | | Move cache code to addon | Max Kostikov | 2018-11-30 | 1 | -17/+7 |
| | | | | |||||
| | * | | Fix wrong parameter | Max Kostikov | 2018-11-29 | 1 | -4/+3 |
| | | | | |||||
| | * | | Update text.php | Max Kostikov | 2018-11-29 | 1 | -5/+0 |
| | | | | |||||
| | * | | Better cache settings logic | Max Kostikov | 2018-11-29 | 1 | -4/+4 |
| | | | | |||||
| | * | | Skip sslify for images if it already were cached with https enabled | Max Kostikov | 2018-11-29 | 1 | -1/+6 |
| | | | | |||||
| | * | | Update text.php | Max Kostikov | 2018-11-29 | 1 | -1/+2 |
| | | | | |||||
| | * | | Cache for viewer channel | Max Kostikov | 2018-11-29 | 1 | -5/+4 |
| | | | | |||||
| | * | | Disable links to cached photos for non logged viewers | Max Kostikov | 2018-11-29 | 1 | -1/+1 |
| | | | | |||||
| | * | | Code cleanup | Max Kostikov | 2018-11-29 | 1 | -3/+3 |
| | | | | |||||
| | * | | Update text.php | Max Kostikov | 2018-11-29 | 1 | -2/+2 |
| | | | | |||||
| | * | | Add photo cache support using sslify() | Max Kostikov | 2018-11-29 | 1 | -6/+27 |
| | | | | |||||
| | * | | Add photo cache hooks | Max Kostikov | 2018-11-29 | 1 | -33/+57 |
| | | | | |||||
| | * | | Add photo cache cleanup | Max Kostikov | 2018-11-29 | 1 | -0/+23 |
| | | | | |||||
| | * | | Update database with expires field for photo | Max Kostikov | 2018-11-29 | 1 | -0/+32 |
| | | | | |||||
| | * | | Add expires for photo | Max Kostikov | 2018-11-29 | 1 | -0/+2 |
| | | | | |||||
| | * | | Add expires for photo | Max Kostikov | 2018-11-29 | 1 | -0/+2 |
| | | | | |||||
| | * | | Add PHOTO_CACHE photo type | Max Kostikov | 2018-11-29 | 1 | -1/+2 |
| | |/ | |||||
| * | | fallback to url if we have not got an addr | Mario Vavti | 2018-12-02 | 1 | -1/+1 |
| | | | | | | | | | (cherry picked from commit a3ba7f0788705a6ebee57433e80712b282b0e784) | ||||
| * | | fix filtering by addr in handleNotificationsItems() | Mario Vavti | 2018-12-02 | 2 | -2/+3 |
| | | | | | | | | | (cherry picked from commit f083c0cba10248926661db42d99d04b5eb7579e8) | ||||
| * | | Merge branch 'pdf_embed_fixes' into 'dev' | M. Dent | 2018-12-02 | 1 | -1/+5 |
| |\ \ | | | | | | | | | | | | | | | | | make pdf preview 100% width and 300px height to match it openstreetmaps preview See merge request hubzilla/core!1414 | ||||
| | * | | make pdf preview 100% width and 300px height to match it openstreetmaps preview | Mario Vavti | 2018-12-01 | 1 | -1/+5 |
| | |/ | |||||
| * | | Merge branch 'sticky_aside_fixes' into 'dev' | M. Dent | 2018-12-02 | 1 | -3/+3 |
| |\ \ | | | | | | | | | | | | | | | | | redbasic sticky aside fixes See merge request hubzilla/core!1415 | ||||
| | * | | redbasic sticky aside fixes | Mario Vavti | 2018-12-01 | 1 | -3/+3 |
| | |/ | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-01 | 7 | -12/+52 |
| |\ \ | | |/ | |/| | |||||
| * | | Merge branch 'es-es' into 'dev' | M. Dent | 2018-11-28 | 1 | -14/+21 |
| |\ \ | | | | | | | | | | | | | | | | | Revision 1 doc/es-es/about/about.bb See merge request hubzilla/core!1410 | ||||
| | * \ | Merge branch 'cherry-pick-5ac08ec3' into 'es-es' | Manuel Jiménez Friaza | 2018-11-26 | 1 | -14/+21 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Revision 1 doc/es-es/about/about.bb See merge request mjfriaza/core!3 | ||||
| | | * | | Revision 1 doc/es-es/about/about.bb | Manuel Jiménez Friaza | 2018-11-26 | 1 | -14/+21 |
| | |/ / | | | | | | | | | (cherry picked from commit 5ac08ec3aa8ede14141390670a8097a60769e11e) | ||||
| * | | | Merge branch 'default2flex-conversion' into 'dev' | M. Dent | 2018-11-28 | 3 | -17/+35 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | use flex for the default template See merge request hubzilla/core!1409 |