aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-211-1/+1
|\
| * like permission issuezotlabs2018-12-201-1/+1
| |
* | Merge branch 'revert-090fe394' into 'dev'Max Kostikov2018-12-201-4/+13
|\ \ | | | | | | | | | | | | Revert "Fix cURL with HTTP/2" See merge request hubzilla/core!1446
| * | Revert "Fix cURL with HTTP/2"Max Kostikov2018-12-201-4/+13
|/ / | | | | This reverts commit 090fe394e4733aea9e9ca2e9a93c2c27b266d065
* | Fix cURL with HTTP/2Max Kostikov2018-12-201-13/+4
| |
* | missing observer checkMario Vavti2018-12-201-0/+3
| |
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-201-2/+87
|\|
| * reverse activity mapping improvementszotlabs2018-12-191-2/+87
| |
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-12-1719-21/+171
| |\
* | \ Merge branch 'dark-fix-dev' into 'dev'Mario2018-12-193-21/+28
|\ \ \ | | | | | | | | | | | | | | | | fix for dark theme; includes one changes to bbcode.php and redbasic/css/style.css See merge request hubzilla/core!1442
| * | | remove color from style.css (default) but add a little padding; add color & ↵phani002018-12-182-1/+7
| | | | | | | | | | | | | | | | border radius to dark.css.
| * | | change hl text color to the default text color in non-dark schema. looks ↵phani002018-12-181-1/+1
| | | | | | | | | | | | | | | | good, except in dark, where i can change it in dark.css.
| * | | remove some fancy formatting.phani002018-12-182-5/+0
| | | |
| * | | new fix for dark themephani002018-12-173-25/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 dark-fix-devphani002018-12-174-8/+35
| |\ \ \ | | | |/ | | |/|
| * | | remove my dark theme fixes.phani002018-12-171-5/+8
| | | |
* | | | Merge branch 'util-reload_addons' into 'dev'Mario2018-12-191-0/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add reload to util/addons See merge request hubzilla/core!1434
| * | | | Add reload to util/addonsM. Dent2018-12-191-0/+15
|/ / / /
* | | | Merge branch 'channel_b64_enc_mid' into 'dev'Max Kostikov2018-12-181-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | make mod channel deal with b64 encoded mid's See merge request hubzilla/core!1443
| * | | | make mod channel deal with b64 encoded mid\sMario Vavti2018-12-181-0/+8
|/ / / / | | | | | | | | | | | | ;
* | | | Merge branch 'dev' into 'dev'Mario2018-12-183-97/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove scale_external_images() See merge request hubzilla/core!1441
| * | | | Remove scale_external_images()Max Kostikov2018-12-171-2/+0
| | | | |
| * | | | Remove scale_external_images()Max Kostikov2018-12-171-93/+0
| | | | |
| * | | | Remove scale_external_images()Max Kostikov2018-12-171-2/+0
| | | | |
* | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-187-16/+42
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | regression: mail from dev to core not deliveringzotlabs2018-12-172-1/+8
| | | |
| * | | fix default values for affinity tool and other information which could be ↵zotlabs2018-12-175-15/+34
| | | | | | | | | | | | | | | | lost when approving a connection without the entire form provided by connedit.
* | | | Merge branch 'dev' into 'dev'Mario2018-12-171-4/+10
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Keep remote site headers to respect caching policy See merge request hubzilla/core!1440
| * | | Keep remote site headers for cachingMax Kostikov2018-12-171-4/+10
| | | |
* | | | Merge branch 'memory-warn2' into 'dev'Mario2018-12-171-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | add warning if upload_filesize < 4MB. See merge request hubzilla/core!1438
| * | | | Update Zotlabs/Module/Setup.phpphani002018-12-161-1/+0
| | | | |
| * | | | add warning if upload_filesize < 4MB.phani002018-12-161-0/+6
| | | | |
* | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-171-0/+15
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | default curl to http/1.1zotlabs2018-12-161-0/+15
| | | | |
| * | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-12-1310-438/+493
| |\ \ \ \
* | \ \ \ \ Merge branch 'dev' into 'dev'Max Kostikov2018-12-171-6/+5
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | Move SSLify code from Photo cache addon See merge request hubzilla/core!1439
| * | | | | Move SSLify code from Photo cache addonMax Kostikov2018-12-171-6/+5
|/ / / / /
* | | | | Revert Photos.php codeMax Kostikov2018-12-171-245/+1357
| | | | |
* | | | | SSLify cached URL on redirect if neededMax Kostikov2018-12-171-1/+3
| | | | |
* | | | | SSLify cached URL on redirect if neededMax Kostikov2018-12-171-1357/+245
| |_|_|/ |/| | |
* | | | Remove photo_cache_enable variableMax Kostikov2018-12-161-1/+1
| | | |
* | | | Merge branch 'patch-20181214a' into 'dev'Mario2018-12-161-2/+10
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | ARTICLES MODULE: Default to local_channel() user when no argv(1) is passed. See merge request hubzilla/core!1427
| * | | Add return if no local_channel()DM42.Net (Matt Dent)2018-12-151-1/+3
| | | |
| * | | ARTICLES MODULE: Default to local_channel() user when no argv(1) is passed.DM42.Net (Matt Dent)2018-12-141-2/+8
| | | |
* | | | Merge branch 'dev' into 'dev'M. Dent2018-12-151-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update OAuth2Storage.php - fix email retrieval in getUser See merge request hubzilla/core!1436
| * | | | Update OAuth2Storage.php - fix email retrieval in getUserPascal Deklerck2018-12-151-1/+1
|/ / / /
* | | | Merge branch 'custom-item-types' into 'dev'Mario2018-12-156-0/+98
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 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 typesDM42.Net (Matt Dent)2018-12-146-0/+98
| |/ / /
* | | | Merge branch 'patch-20181214f' into 'dev'Mario2018-12-151-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Set min/maxversion for plugins to STD_VERSION unless otherwise specified See merge request hubzilla/core!1430
| * | | | Set min/maxversion for plugins to STD_VERSION unless otherwise specifiedDM42.Net (Matt Dent)2018-12-141-2/+2
| |/ / /