aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |/ /
| * | fix issue with linkdropperMario Vavti2018-12-141-2/+2
| | |
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-145-47/+94
| |\ \
* | | | 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.
* | | 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 'fix_photo_imagick' into 'dev'Max Kostikov2018-12-111-0/+1
| |\ | | | | | | | | | | | | return on readImageBlob() exception See merge request hubzilla/core!1426
| | * return on readImageBlob() exceptionMario Vavti2018-12-111-0/+1
| |/
| * Merge branch 'photo-hook' into 'dev'M. Dent2018-12-104-3/+16
| |\ | | | | | | | | | | | | add photo_view_filter hook and fix minor issue with unset auto_save_draft… See merge request hubzilla/core!1425
| | * add photo_view_filter hook and fix minor issue with unset auto_save_draft ↵Mario Vavti2018-12-104-3/+16
| | | | | | | | | | | | variable which resultet in a javascript error
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-105-3/+53
| |\ \
| * \ \ Merge branch 'dark-theme-dev' into 'dev'M. Dent2018-12-101-0/+19
| |\ \ \ | | | | | | | | | | | | | | | | | | | | change redbasic dark schema to make categories and highlights readable See merge request hubzilla/core!1424
| | * | | change redbasic dark schema to make categories and highlights readablephani002018-12-101-0/+19
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | additions to /view/theme/redbasic/schema/dark.css to change the appearance of category badges and highlighted text ([hl]...[/hl]). hl text changed from master: it's not 'strong' anymore. commented out the pseudo-class selector that works in master but not in dev anymore.
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-061-2/+1
| |\ \ \ | | |_|/ | |/| |
| * | | Merge branch 'dev' into 'dev'Max Kostikov2018-12-043-420/+445
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Add strings to Russian translation See merge request hubzilla/core!1418
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 01:54:14 +0000