aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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
| * | 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
|\ \ | |/ |/|
| * 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
|/
* 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
* | Merge branch 'patch-20181028a' into 'dev'Mario2018-11-052-4/+37
|\ \ | |/ |/|
| * 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
| |\ \
| | * | 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
|/
* delivery chain linkage messed up if original post was editedzotlabs2018-10-261-6/+15
* refine stream filter and forum notification behaviour (mostly for performance...Mario Vavti2018-10-241-1/+1
* Fix template root redirectionM.Dent2018-10-171-1/+2
* Merge branch 'dev' into 'dev'Mario2018-10-151-3/+4
|\
| * fix phpunit error with html2markdown test and temporary disable failing markd...git-marijus2018-10-131-3/+4
* | 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
* | Revert "Merge branch 'patch-11' into 'dev'"Mario Vavti2018-10-132-42/+5
* | Merge branch 'dev' into 'dev'Mario2018-10-131-2/+3
|\ \
| * | Fix order of assignment and get template file before returnZotSocial Admin2018-10-121-2/+3
| |/
* | Update language.phpMax Kostikov2018-10-131-2/+1
* | Update language.phpMax Kostikov2018-10-131-3/+4
* | Update language.phpMax Kostikov2018-10-131-2/+2
* | Update language.phpMax Kostikov2018-10-131-1/+1
* | Update language.phpMax Kostikov2018-10-131-2/+1
* | Update language.phpMax Kostikov2018-10-131-4/+2
* | Update language.phpMax Kostikov2018-10-131-1/+1