Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge from upstream #3

Merged
merged 2,608 commits into from
Dec 19, 2020
Merged

Merge from upstream #3

merged 2,608 commits into from
Dec 19, 2020

Conversation

peterchs
Copy link
Owner

Description:

Related issue (if applicable): fixes #

Checklist:

  • The pull request is done against the latest dev branch
  • Only relevant files were touched
  • Only one feature/fix was added per PR.
  • The code change is tested and works on core ESP8266 V.2.7.1
  • The code change is tested and works on core ESP32 V.1.12.0
  • I accept the CLA.

NOTE: The code change must pass CI tests. Your PR cannot be merged unless tests pass

pcdiem and others added 30 commits November 25, 2020 16:05
@pcdiem
Make light send/receive to/from relay dgr
1b437e5
@pcdiem
Check SO88 to use separate DGR
43ca3cc
@arendst
Merge pull request #9980 from pcdiem/dgr3
0513bce 
Make light send/receive to/from relay dgr when SO88 enabled
@arendst
Merge pull request #9976 from s-hadinger/ir_2_7_13
c5e7b0d 
IRremoteESP8266 library from v2.7.12 to v2.7.13
@Jason2866
minicustom
b641216
@arendst
Merge pull request #9983 from Jason2866/development
25dfb84 
Compile option to build custom minimal version
@ascillato
Fix HA Discovery Issue with Uninitialized Sensors
2721444
@arendst
Merge pull request #9985 from ascillato/patch-1
3b0cfab 
Fix HA Discovery Issue with Uninitialized Sensors
@pcdiem
Support rules that override button holds
b0fb909
@arendst
Merge pull request #9986 from pcdiem/pwm1
44710e7 
Support rules that override button holds
@ascillato
Update Spanish Translation
f1f94eb
@s-hadinger
Zigbee UI change color of last seen depending on age
f153086
@ascillato2
Merge pull request #9988 from ascillato/patch-1
af9eed9 
Update Spanish Translation
@s-hadinger
Merge pull request #9989 from s-hadinger/zigbee_last_seen_grey
e899e01 
Zigbee UI change color of last seen depending on age
@Jason2866
CCLoader firmware cc2541
c70e862
@Jason2866
zigbee 2530 firmware
fcdd992
@Jason2866
del
226507a
@Staars
ports from MI32 to HM10
f53ac70
@effelle
HaTasmota: enhanced support for shutters
866b286
@arendst
Merge pull request #9994 from effelle/discovery
d58524a 
HaTasmota: enhanced support for shutters
@arendst
Merge pull request #9992 from Staars/HM10
22fe64e 
HM10: ports from MI32 to HM10
@emontnemery
Fix wraparound bug in backlog
aa12879
@arendst
Merge pull request #9995 from emontnemery/fix_backlog_wrap_around
c57e79d 
Fix wraparound bug in backlog
@arendst
Delete ncp-uart-sw-6.8.0.1_115200.ota
16f369e
@arendst
Remove mismerged files
7091659
@arendst
Merge pull request #9991 from Jason2866/work_dev
01e7b0b 
CCLoader firmware for zigbee and BT
@arendst
Move some firmware files around
ff8b2ef
@arendst
Fix reset to defaults after 6 hours of DeepSleep
4b5dbe7 
Fix reset to defaults after 6 hours of DeepSleep (#9993)
@arendst
Remove spaces
8c9af52
@Staars
do not crash with zero sensors
26dcf91
arendst and others added 29 commits December 18, 2020 09:33
@arendst
Merge pull request #10170 from stefanbode/patch-8
50cb0bf 
#10166 fixed
@gemu2015
m5stack core2 support
c93e810
@bovirus
Update Italian language
c3916ca
@arendst
Merge pull request #10174 from bovirus/patch-1
af31b9a 
Update Italian language
@arendst
Redesign syslog and mqttlog using log buffer
b7af08c 
Redesign syslog and mqttlog using log buffer (#10164)
@arendst
Merge branch 'development' of https://github.com/arendst/Tasmota into…
e7e06e4 
… development
@arendst
Merge pull request #10171 from gemu2015/core2_support
e6d815c 
m5stack core2 support
@arendst
Fix compilation
93c7f7b
@arendst
Rename web_log to log_buffer
2eb4eef
@arendst
Effort to get rid of PrepLog_P
bafcee4 
Effort to get rid of PrepLog_P now syslog and mqttlog are async
@ascillato
Update Links when opening a new issue
9bc4a7f
@ascillato
Move Feature Requests to Github Discussions
9a963c4
@ascillato
Update Issue Template with new links
214ed89
@ascillato
Issue Template explanations update
60715ee
@ascillato
Update Issue-Close-Bot with new links
b9dcc2e
@ascillato
Update Readme Links
8d9273d
@barbudor
Allow DS18X20_MAX_SENSORS to be redefined
c2f0f96
@gemu2015
fix script_sub_command
ac33b5b
@arendst
Merge pull request #10178 from barbudor/pr_number_ds18x20
6aa26c6 
Allow DS18X20_MAX_SENSORS to be redefined
@arendst
Merge pull request #10181 from gemu2015/sub_cmd_fix-
2f17da8 
fix script_sub_command
@arendst
Merge pull request #10177 from ascillato/patch-1
a565e91 
Update Links to Github Discussions
@jamesturton
Shelly Dimmer: Use global setting value for brightness and fade rate …
898c87a 
…at startup
@arendst
Merge pull request #10182 from jamesturton/fix-shd-poweronstate
c8d6834 
Shelly Dimmer: Use global setting value for brightness and fade rate at startup
@arendst
Update changelog
9fb2f18
@arendst
Update changelog
9153746
@Jason2866
Use ESP32 1.0.5-rc4 for development
65af506
@Jason2866
ESP32 1.0.5-rc4
febd981
@arendst
Merge pull request #10184 from Jason2866/patch-1
5d7e911 
Use ESP32 1.0.5-rc4 for development
@arendst
Refactor logging
5f7aacf
@peterchs peterchs merged commit 054320e into peterchs:development Dec 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.