aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-012-4/+27
|\
| * 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
* | Merge remote-tracking branch 'mike/master' into devMario2018-11-232-17/+19
|\|
| * use uuid in file storagezotlabs2018-11-221-2/+2
| |
| * fix mastodon tag notifications (again)zotlabs2018-11-211-15/+17
| |
* | Merge remote-tracking branch 'mike/master' into devMario2018-11-221-4/+4
|\|
| * no mention notifications from mastodon (and pleroma)zotlabs2018-11-211-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)
* 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
| | | * Remove DNS check for database connection during installation. Causes ↵Andrew Manning2018-11-091-9/+9
| | | | | | | | | | | | | | | | friction with Docker deployment.
| | * | Fixed wrong value assign on compare with 0Max Kostikov2018-11-101-1/+1
| | | |
| * | | Update photo_driver.phpMax Kostikov2018-11-101-1/+1
| | | |
| * | | Fixed wrong value assign on compare with 0Max Kostikov2018-11-101-1/+1
| |/ /
| * | Do not return default images from vCardMax Kostikov2018-11-101-1/+0
| | |
| * | Preserve received image modification date on cachingMax Kostikov2018-11-091-11/+16
| | |
| * | 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
| |/
| * 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
| |\
* | | stay ahead of the gamezotlabs2018-11-131-2/+2
| | |
* | | item uuid changeszotlabs2018-11-122-20/+11
| | |
* | | dreport updateszotlabs2018-11-121-4/+6
| | |
* | | more z6 debuggingzotlabs2018-11-112-8/+12
| | |
* | | add zot6 delivery methodzotlabs2018-11-081-23/+76
| | |
* | | begin native summary supportzotlabs2018-11-082-4/+34
| | |
* | | Merge branch 'master' into zvizotlabs2018-11-072-4/+37
|\ \ \
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-11-072-4/+37
| |\| | | | |/ | |/|
| | * Merge branch 'patch-20181028a' into 'dev'Mario2018-11-052-4/+37
| | |\ | | | | | | | | | | | | | | | | Add timestamp to pconfig See merge request hubzilla/core!1355