aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-12-035-27/+48
|\
| * more notifications fixesMario Vavti2018-12-031-1/+1
| | | | | | (cherry picked from commit 9ef6c57ca59aa318a3564f6b48c6442870650d3e)
| * catch exception if readImageBlob() receives bogus dataMario Vavti2018-12-031-3/+7
| | | | | | (cherry picked from commit 443d7684dbe8c1c3540df5aeb719403d67789747)
| * Merge branch 'photocache' into 'dev'Max Kostikov2018-12-031-13/+18
| |\ | | | | | | | | | | | | Add flag to allow to save image without validation See merge request hubzilla/core!1416
| | * Add Expires field supportMax Kostikov2018-12-031-11/+16
| | |
| | * Add flag to allow to save image without validationMax Kostikov2018-12-021-2/+2
| | |
| * | Merge branch 'photocache' into 'dev'M. Dent2018-12-021-5/+15
| |\| | | | | | | | | | | | | Add Photo Cache addon support See merge request hubzilla/core!1412
| | * Remove local_channel() check on cache_body_hook callMax Kostikov2018-12-021-9/+7
| | |
| | * Check local_channel() before cache callMax Kostikov2018-11-301-6/+8
| | |
| | * Move cache code to addonMax Kostikov2018-11-301-17/+7
| | |
| | * Fix wrong parameterMax Kostikov2018-11-291-4/+3
| | |
| | * Update text.phpMax Kostikov2018-11-291-5/+0
| | |
| | * Skip sslify for images if it already were cached with https enabledMax Kostikov2018-11-291-1/+6
| | |
| | * Update text.phpMax Kostikov2018-11-291-1/+2
| | |
| | * Cache for viewer channelMax Kostikov2018-11-291-5/+4
| | |
| | * Disable links to cached photos for non logged viewersMax Kostikov2018-11-291-1/+1
| | |
| | * Update text.phpMax Kostikov2018-11-291-2/+2
| | |
| | * Add photo cache support using sslify()Max Kostikov2018-11-291-6/+27
| | |
| * | Merge branch 'pdf_embed_fixes' into 'dev'M. Dent2018-12-021-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 previewMario Vavti2018-12-011-1/+5
| | |/
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-012-4/+27
| |\ \ | | |/ | |/|
| * | Merge remote-tracking branch 'mike/master' into devMario2018-11-232-17/+19
| |\ \
| * \ \ Merge remote-tracking branch 'mike/master' into devMario2018-11-221-4/+4
| |\ \ \
| * | | | Fix: delayed items propagate before publication on cloned channelsDM42.Net (Matt Dent)2018-11-181-2/+0
| | | | |
| * | | | strlen($this->imageString()) does not return the correct size when dealing ↵Mario Vavti2018-11-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | with os_storage images. use filesize() instead. (cherry picked from commit afc75af62f759181bbe6a806b523c6ca52126f5f)
* | | | | more work on z6 commentingzotlabs2018-12-031-0/+15
| |_|_|/ |/| | |
* | | | attached photo permissions regressionzotlabs2018-11-301-4/+4
| | | |
* | | | prevent incompatible export files (osada/zap) from being imported. This is ↵zotlabs2018-11-271-0/+23
| |_|/ |/| | | | | | | | to keep your DB from getting trashed. We probably need a similar thing for item import since the object formats aren't compatible
* | | use uuid in file storagezotlabs2018-11-221-2/+2
| | |
* | | fix mastodon tag notifications (again)zotlabs2018-11-211-15/+17
| |/ |/|
* | no mention notifications from mastodon (and pleroma)zotlabs2018-11-211-4/+4
|/
* datetime_convert wrong argszotlabs2018-11-151-1/+1
|
* delivery report issuezotlabs2018-11-151-2/+3
|
* add item.uuid to relevant placeszotlabs2018-11-157-13/+28
|
* fixes to old z6 deliveryzotlabs2018-11-141-4/+3
|
* more loggingzotlabs2018-11-141-0/+2
|
* more loggingzotlabs2018-11-141-0/+1
|
* check keyidzotlabs2018-11-141-1/+1
|
* filter by networkzotlabs2018-11-141-2/+2
|
* crypto fixzotlabs2018-11-141-1/+1
|
* Merge branch 'master' into zvizotlabs2018-11-142-21/+1
|\
| * Merge branch 'patch-20181113b' into 'dev'Mario2018-11-141-1/+1
| |\ | | | | | | | | | | | | Patch 20181113b See merge request hubzilla/core!1395
| | * Revert "Filter search box before display"DM42.Net (Matt Dent)2018-11-131-1/+1
| | | | | | | | | | | | This reverts commit 35e66770be6ca93c9090cdab221e6c33a410a569.
| * | Merge branch 'dev' into 'dev'Mario2018-11-141-20/+0
| |\ \ | | |/ | |/| | | | | | | Remove unneccessary fetch_image_from_url() function See merge request hubzilla/core!1393
| | * Remove fetch_image_from_url() because of functions duplicateMax Kostikov2018-11-131-20/+0
| | |
* | | Merge branch 'master' into zvizotlabs2018-11-134-152/+198
|\| |
| * | Filter search box before displayDM42.Net (Matt Dent)2018-11-131-1/+1
| | |
| * | fix css issues in bbcode conversion and focus-light schemaMario Vavti2018-11-121-6/+6
| |/
| * Merge branch 'dev' into 'dev'Max Kostikov2018-11-101-9/+9
| |\ | | | | | | | | | # Conflicts: # include/photo/photo_driver.php
| | * Merge branch 'dev' into 'dev'Mario2018-11-101-9/+9
| | |\ | | | | | | | | | | | | | | | | Remove DNS check for database connection during installation... See merge request hubzilla/core!1384