Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | filter by network | zotlabs | 2018-11-14 | 1 | -2/+2 | |
| | ||||||
* | crypto fix | zotlabs | 2018-11-14 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'master' into zvi | zotlabs | 2018-11-14 | 2 | -21/+1 | |
|\ | ||||||
| * | Merge branch 'patch-20181113b' into 'dev' | Mario | 2018-11-14 | 1 | -1/+1 | |
| |\ | | | | | | | | | | | | | Patch 20181113b See merge request hubzilla/core!1395 | |||||
| | * | Revert "Filter search box before display" | DM42.Net (Matt Dent) | 2018-11-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | This reverts commit 35e66770be6ca93c9090cdab221e6c33a410a569. | |||||
| * | | Merge branch 'dev' into 'dev' | Mario | 2018-11-14 | 1 | -20/+0 | |
| |\ \ | | |/ | |/| | | | | | | | Remove unneccessary fetch_image_from_url() function See merge request hubzilla/core!1393 | |||||
| | * | Remove fetch_image_from_url() because of functions duplicate | Max Kostikov | 2018-11-13 | 1 | -20/+0 | |
| | | | ||||||
* | | | Merge branch 'master' into zvi | zotlabs | 2018-11-13 | 4 | -152/+198 | |
|\| | | ||||||
| * | | Filter search box before display | DM42.Net (Matt Dent) | 2018-11-13 | 1 | -1/+1 | |
| | | | ||||||
| * | | fix css issues in bbcode conversion and focus-light schema | Mario Vavti | 2018-11-12 | 1 | -6/+6 | |
| |/ | ||||||
| * | Merge branch 'dev' into 'dev' | Max Kostikov | 2018-11-10 | 1 | -9/+9 | |
| |\ | | | | | | | | | | # Conflicts: # include/photo/photo_driver.php | |||||
| | * | Merge branch 'dev' into 'dev' | Mario | 2018-11-10 | 1 | -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 Manning | 2018-11-09 | 1 | -9/+9 | |
| | | | | | | | | | | | | | | | | friction with Docker deployment. | |||||
| | * | | Fixed wrong value assign on compare with 0 | Max Kostikov | 2018-11-10 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Update photo_driver.php | Max Kostikov | 2018-11-10 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Fixed wrong value assign on compare with 0 | Max Kostikov | 2018-11-10 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Do not return default images from vCard | Max Kostikov | 2018-11-10 | 1 | -1/+0 | |
| | | | ||||||
| * | | Preserve received image modification date on caching | Max Kostikov | 2018-11-09 | 1 | -11/+16 | |
| | | | ||||||
| * | | Merge branch 'patch-1' into 'dev' | Mario | 2018-11-09 | 1 | -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 headers | Max Kostikov | 2018-11-08 | 1 | -23/+7 | |
| | | | ||||||
| | * | Return image modification date using HTTP 'Last-Modified' and '304 Not ↵ | Max Kostikov | 2018-11-08 | 1 | -115/+159 | |
| | | | | | | | | | | | | Modified' on remote fetch for caching | |||||
| * | | Workaround for local resource path to photo from Diaspora | Max Kostikov | 2018-11-09 | 1 | -0/+1 | |
| |/ | ||||||
| * | provide a function to log to syslog | Mario Vavti | 2018-11-08 | 1 | -0/+13 | |
| | | ||||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-11-07 | 3 | -45/+95 | |
| |\ | ||||||
* | | | stay ahead of the game | zotlabs | 2018-11-13 | 1 | -2/+2 | |
| | | | ||||||
* | | | item uuid changes | zotlabs | 2018-11-12 | 2 | -20/+11 | |
| | | | ||||||
* | | | dreport updates | zotlabs | 2018-11-12 | 1 | -4/+6 | |
| | | | ||||||
* | | | more z6 debugging | zotlabs | 2018-11-11 | 2 | -8/+12 | |
| | | | ||||||
* | | | add zot6 delivery method | zotlabs | 2018-11-08 | 1 | -23/+76 | |
| | | | ||||||
* | | | begin native summary support | zotlabs | 2018-11-08 | 2 | -4/+34 | |
| | | | ||||||
* | | | Merge branch 'master' into zvi | zotlabs | 2018-11-07 | 2 | -4/+37 | |
|\ \ \ | ||||||
| * | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-11-07 | 2 | -4/+37 | |
| |\| | | | |/ | |/| | ||||||
| | * | Merge branch 'patch-20181028a' into 'dev' | Mario | 2018-11-05 | 2 | -4/+37 | |
| | |\ | | | | | | | | | | | | | | | | | Add timestamp to pconfig See merge request hubzilla/core!1355 | |||||
| | | * | strpos needs to test with ===0 not ==0 | M.Dent | 2018-11-01 | 1 | -3/+3 | |
| | | | | ||||||
| | | * | Add timestamp and associated logic to pconfig | M.Dent | 2018-10-28 | 2 | -4/+37 | |
| | | | | ||||||
| * | | | signature issue | zotlabs | 2018-11-06 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | fix signatures | zotlabs | 2018-11-06 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | this is brutal | zotlabs | 2018-11-06 | 2 | -4/+28 | |
| | | | | ||||||
* | | | | populate new fields | zotlabs | 2018-11-05 | 2 | -16/+47 | |
|/ / / | ||||||
* / / | these changes needed to ensure cloning/syncing works in the future to ↵ | zotlabs | 2018-11-05 | 2 | -44/+94 | |
|/ / | | | | | | | non-zot6 enabled servers after the (coming) zot6 schema updates. This should probably be on a fast track to master branch | |||||
* | | Fix wrong image resize for some external images | Max Kostikov | 2018-11-01 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-10-31 | 1 | -1/+6 | |
|\ \ | ||||||
| * \ | Merge branch 'patch-20' into 'dev' | Mario | 2018-10-31 | 1 | -1/+6 | |
| |\ \ | | | | | | | | | | | | | | | | | Beautiful embedding for Hubzilla links See merge request hubzilla/core!1360 | |||||
| | * | | Update oembed.php | Max Kostikov | 2018-10-30 | 1 | -1/+5 | |
| | | | | ||||||
| | * | | Beautiful embedding for Hubzilla links | Max Kostikov | 2018-10-30 | 1 | -1/+2 | |
| | |/ | ||||||
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-10-30 | 1 | -12/+14 | |
|\| | | ||||||
| * | | fix markdown tests | Mario Vavti | 2018-10-30 | 1 | -1/+2 | |
| | | | ||||||
| * | | really fix html2markdown() - when using environment, we must set the defaults | Mario Vavti | 2018-10-30 | 1 | -5/+13 | |
| | | | ||||||
| * | | fix html2markdown() and re-enable previously failing tests | Mario Vavti | 2018-10-30 | 1 | -9/+2 | |
| |/ | ||||||
* | | typo | zotlabs | 2018-10-30 | 1 | -1/+1 | |
| | |