aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* fix mastodon tag notifications (again)zotlabs2018-12-021-15/+17
| | | (cherry picked from commit 8e713245144d0bcedca0d3345017b5fa232c8ca3)
* no mention notifications from mastodon (and pleroma)zotlabs2018-12-021-4/+4
| | | (cherry picked from commit ea235c0c6751b682332b968b4c18f905e8ece451)
* Merge branch 'patch-20181118a' into 'dev'Mario2018-11-191-2/+0
| | | | | | | | | Patch 20181118a - fix delayed publication of posts See merge request hubzilla/core!1398 (cherry picked from commit f34af496ec82555a0e070e91260dc6edb17f2d5a) 3787c490 Fix: delayed items propagate before publication on cloned channels
* strlen($this->imageString()) does not return the correct size when dealing ↵Mario Vavti2018-11-161-2/+2
| | | | with os_storage images. use filesize() instead.
* delivery issuezotlabs2018-11-151-3/+3
|
* 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
| |
* | 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
|\
| * signature issuezotlabs2018-11-061-1/+1
| |
| * these changes needed to ensure cloning/syncing works in the future to ↵zotlabs2018-11-052-44/+94
| | | | | | | | non-zot6 enabled servers after the (coming) zot6 schema updates. This should probably be on a fast track to master branch
* | Merge branch 'patch-20181028a' into 'dev'Mario2018-11-052-4/+37
|\ \ | |/ |/| | | | | Add timestamp to pconfig See merge request hubzilla/core!1355
| * strpos needs to test with ===0 not ==0M.Dent2018-11-011-3/+3
| |
| * Add timestamp and associated logic to pconfigM.Dent2018-10-282-4/+37
| |
* | Fix wrong image resize for some external imagesMax Kostikov2018-11-011-2/+2
| |
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-10-311-1/+6
|\ \
| * \ Merge branch 'patch-20' into 'dev'Mario2018-10-311-1/+6
| |\ \ | | | | | | | | | | | | | | | | Beautiful embedding for Hubzilla links See merge request hubzilla/core!1360
| | * | Update oembed.phpMax Kostikov2018-10-301-1/+5
| | | |
| | * | Beautiful embedding for Hubzilla linksMax Kostikov2018-10-301-1/+2
| | |/
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-10-301-12/+14
|\| |
| * | fix markdown testsMario Vavti2018-10-301-1/+2
| | |
| * | really fix html2markdown() - when using environment, we must set the defaultsMario Vavti2018-10-301-5/+13
| | |
| * | fix html2markdown() and re-enable previously failing testsMario Vavti2018-10-301-9/+2
| |/
* | typozotlabs2018-10-301-1/+1
| |
* | issue syncing the channel_primary setting which shows up as a wrong count on ↵zotlabs2018-10-302-19/+17
|/ | | | the admin summary page
* delivery chain linkage messed up if original post was editedzotlabs2018-10-261-6/+15
|
* refine stream filter and forum notification behaviour (mostly for ↵Mario Vavti2018-10-241-1/+1
| | | | performance). personal posts will be displayed in unthreaded mode and clicking a forum notification will show only the unseen items of the forum in unthreaded mode. group the filters in the widget - threaded at the top, unthreaded beneath.
* Fix template root redirectionM.Dent2018-10-171-1/+2
|
* Merge branch 'dev' into 'dev'Mario2018-10-151-3/+4
|\ | | | | | | | | Bring back some basic automated testing for PHP7.1 and mysql via gitlab-ci. See merge request hubzilla/core!1332
| * fix phpunit error with html2markdown test and temporary disable failing ↵git-marijus2018-10-131-3/+4
| | | | | | | | markdown test in connection with **bold** and _italic_ (it is not clear why they fail and the code appears to work as expected)
* | Update language.phpMax Kostikov2018-10-141-1/+1
| |
* | Update js_strings.phpMax Kostikov2018-10-131-5/+5
| |
* | Update language.phpMax Kostikov2018-10-131-0/+26
| |
* | Add date/time plurals translation in JavaScriptMax Kostikov2018-10-131-0/+9
| |