aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | more work on z6 eventszotlabs2019-01-161-0/+37
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | more z6 compatibility fixeszotlabs2019-01-164-3/+9
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | failure to import mailzotlabs2019-01-101-2/+3
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | make Apps::get_base_apps() pluggablezotlabs2019-01-081-1/+3
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | better handling of notification updates while commentingzotlabs2019-01-021-1/+6
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | allow notification updates when composing comments. This was disabled when ↵zotlabs2019-01-022-4/+4
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | it was possible to have liveUpdate run automatically while composing comments, but it seems that live update is no longer possible (however the setting still remains - this should probably be removed).
| * | | | | | | | like permission issuezotlabs2018-12-201-1/+1
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | 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 '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
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ 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
| | | |/ / /
| | * | | | Merge branch 'patch-20181214d' into 'dev'Mario2018-12-153-2/+22
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Affinity Slider (optionally) 'sticky' across page loads. See merge request hubzilla/core!1429
| | | * | | | Fix syntax errorDM42.Net (Matt Dent)2018-12-142-2/+2
| | | | | | |
| | | * | | | Make Affinity Slider (optionally) 'sticky' across page loads. (default is ↵DM42.Net (Matt Dent)2018-12-143-2/+22
| | | |/ / / | | | | | | | | | | | | | | | | | | current behavior: reset slider with each page load)
| | * | | | fix wiki preview issue with hyperlinksMario Vavti2018-12-151-2/+2
| | | | | |
| | * | | | Merge branch 'patch-20181214b' into 'dev'Max Kostikov2018-12-141-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recreate MR#1419 for dev branch See merge request hubzilla/core!1428
| | | * | | | Recreate MR#1419 for dev branchDM42.Net (Matt Dent)2018-12-141-1/+1
| | | |/ / /
| | * / / / update changelogMario Vavti2018-12-141-0/+12
| | |/ / /