aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * Revert "Filter search box before display"DM42.Net (Matt Dent)2018-11-131-1/+1
| * | Merge branch 'dev' into 'dev'Mario2018-11-141-20/+0
| |\ \ | | |/ | |/|
| | * 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
| |\
| | * 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
| |\
* | | 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
| | |\
| | | * 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
| * | | signature issuezotlabs2018-11-061-1/+1
* | | | fix signatureszotlabs2018-11-061-1/+1
* | | | this is brutalzotlabs2018-11-062-4/+28
* | | | populate new fieldszotlabs2018-11-052-16/+47
|/ / /
* / / these changes needed to ensure cloning/syncing works in the future to non-zot...zotlabs2018-11-052-44/+94
|/ /
* | 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
|/