Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dark-fix-dev' into 'dev' | Mario | 2018-12-19 | 1 | -1/+1 |
|\ | | | | | | | | | fix for dark theme; includes one changes to bbcode.php and redbasic/css/style.css See merge request hubzilla/core!1442 | ||||
| * | remove some fancy formatting. | phani00 | 2018-12-18 | 1 | -1/+0 |
| | | |||||
| * | new fix for dark theme | phani00 | 2018-12-17 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | change implementation of hl-tags in include/bbcode.php insert class='default-highlight' instead of background-color: 'yellow' into span add span.default-highlight definition to view/theme/redbasic/css/style.css this works for all schemas incl. dark. | ||||
* | | Merge branch 'dev' into 'dev' | Mario | 2018-12-18 | 3 | -97/+0 |
|\ \ | | | | | | | | | | | | | Remove scale_external_images() See merge request hubzilla/core!1441 | ||||
| * | | Remove scale_external_images() | Max Kostikov | 2018-12-17 | 1 | -2/+0 |
| | | | |||||
| * | | Remove scale_external_images() | Max Kostikov | 2018-12-17 | 1 | -93/+0 |
| | | | |||||
| * | | Remove scale_external_images() | Max Kostikov | 2018-12-17 | 1 | -2/+0 |
| | | | |||||
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-18 | 2 | -3/+3 |
|\ \ \ | |_|/ |/| | | |||||
| * | | regression: mail from dev to core not delivering | zotlabs | 2018-12-17 | 1 | -0/+2 |
| | | | |||||
| * | | fix default values for affinity tool and other information which could be ↵ | zotlabs | 2018-12-17 | 1 | -3/+1 |
| | | | | | | | | | | | | lost when approving a connection without the entire form provided by connedit. | ||||
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-17 | 1 | -0/+15 |
|\| | | |/ |/| | |||||
| * | default curl to http/1.1 | zotlabs | 2018-12-16 | 1 | -0/+15 |
| | | |||||
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-12-13 | 2 | -1/+2 |
| |\ | |||||
* | \ | Merge branch 'custom-item-types' into 'dev' | Mario | 2018-12-15 | 1 | -0/+30 |
|\ \ \ | | | | | | | | | | | | | | | | | Add ITEM_TYPE_CUSTOM and hooks for processing custom item types See merge request hubzilla/core!1431 | ||||
| * | | | Add ITEM_TYPE_CUSTOM and hooks for processing custom item types | DM42.Net (Matt Dent) | 2018-12-14 | 1 | -0/+30 |
| | | | | |||||
* | | | | Set min/maxversion for plugins to STD_VERSION unless otherwise specified | DM42.Net (Matt Dent) | 2018-12-14 | 1 | -2/+2 |
|/ / / | |||||
* | / | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-14 | 1 | -15/+45 |
|\| | | |/ |/| | |||||
| * | regression: the ability to order apps messed up since adding pinned apps to ↵ | zotlabs | 2018-12-12 | 1 | -15/+45 |
| | | | | | | | | the ordering | ||||
* | | return on readImageBlob() exception | Mario Vavti | 2018-12-11 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-10 | 1 | -0/+29 |
|\| | |||||
| * | rmagic discovery for z6 networks | zotlabs | 2018-12-09 | 1 | -0/+29 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2018-12-04 | 1 | -1/+1 |
|\ \ | |/ |/| | | | | | Add strings to Russian translation See merge request hubzilla/core!1418 | ||||
| * | Create plink depending on message id format | Max Kostikov | 2018-11-30 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-12-03 | 5 | -27/+48 |
|\ \ | |||||
| * | | more notifications fixes | Mario Vavti | 2018-12-03 | 1 | -1/+1 |
| | | | | | | | | | (cherry picked from commit 9ef6c57ca59aa318a3564f6b48c6442870650d3e) | ||||
| * | | catch exception if readImageBlob() receives bogus data | Mario Vavti | 2018-12-03 | 1 | -3/+7 |
| | | | | | | | | | (cherry picked from commit 443d7684dbe8c1c3540df5aeb719403d67789747) | ||||
| * | | Merge branch 'photocache' into 'dev' | Max Kostikov | 2018-12-03 | 1 | -13/+18 |
| |\ \ | | | | | | | | | | | | | | | | | Add flag to allow to save image without validation See merge request hubzilla/core!1416 | ||||
| | * | | Add Expires field support | Max Kostikov | 2018-12-03 | 1 | -11/+16 |
| | | | | |||||
| | * | | Add flag to allow to save image without validation | Max Kostikov | 2018-12-02 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'photocache' into 'dev' | M. Dent | 2018-12-02 | 1 | -5/+15 |
| |\| | | | | | | | | | | | | | | | | | | Add Photo Cache addon support See merge request hubzilla/core!1412 | ||||
| | * | | Remove local_channel() check on cache_body_hook call | Max Kostikov | 2018-12-02 | 1 | -9/+7 |
| | | | | |||||
| | * | | Check local_channel() before cache call | Max Kostikov | 2018-11-30 | 1 | -6/+8 |
| | | | | |||||
| | * | | Move cache code to addon | Max Kostikov | 2018-11-30 | 1 | -17/+7 |
| | | | | |||||
| | * | | Fix wrong parameter | Max Kostikov | 2018-11-29 | 1 | -4/+3 |
| | | | | |||||
| | * | | Update text.php | Max Kostikov | 2018-11-29 | 1 | -5/+0 |
| | | | | |||||
| | * | | Skip sslify for images if it already were cached with https enabled | Max Kostikov | 2018-11-29 | 1 | -1/+6 |
| | | | | |||||
| | * | | Update text.php | Max Kostikov | 2018-11-29 | 1 | -1/+2 |
| | | | | |||||
| | * | | Cache for viewer channel | Max Kostikov | 2018-11-29 | 1 | -5/+4 |
| | | | | |||||
| | * | | Disable links to cached photos for non logged viewers | Max Kostikov | 2018-11-29 | 1 | -1/+1 |
| | | | | |||||
| | * | | Update text.php | Max Kostikov | 2018-11-29 | 1 | -2/+2 |
| | | | | |||||
| | * | | Add photo cache support using sslify() | Max Kostikov | 2018-11-29 | 1 | -6/+27 |
| | |/ | |||||
| * | | Merge branch 'pdf_embed_fixes' into 'dev' | M. Dent | 2018-12-02 | 1 | -1/+5 |
| |\ \ | | | | | | | | | | | | | | | | | make pdf preview 100% width and 300px height to match it openstreetmaps preview See merge request hubzilla/core!1414 | ||||
| | * | | make pdf preview 100% width and 300px height to match it openstreetmaps preview | Mario Vavti | 2018-12-01 | 1 | -1/+5 |
| | |/ | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-01 | 2 | -4/+27 |
| |\ \ | | |/ | |/| | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario | 2018-11-23 | 2 | -17/+19 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'mike/master' into dev | Mario | 2018-11-22 | 1 | -4/+4 |
| |\ \ \ | |||||
| * | | | | Fix: delayed items propagate before publication on cloned channels | DM42.Net (Matt Dent) | 2018-11-18 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | strlen($this->imageString()) does not return the correct size when dealing ↵ | Mario Vavti | 2018-11-16 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | with os_storage images. use filesize() instead. (cherry picked from commit afc75af62f759181bbe6a806b523c6ca52126f5f) | ||||
* | | | | | more work on z6 commenting | zotlabs | 2018-12-03 | 1 | -0/+15 |
| |_|_|/ |/| | | | |||||
* | | | | attached photo permissions regression | zotlabs | 2018-11-30 | 1 | -4/+4 |
| | | | |