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

Development #499

Merged
merged 716 commits into from
Jan 4, 2021
Merged

Development #499

merged 716 commits into from
Jan 4, 2021

Conversation

tablatronix
Copy link
Collaborator

tracking

@tablatronix tablatronix mentioned this pull request Jan 31, 2018
Open
@tablatronix
Copy link
Collaborator Author

@tzapu
ESP32 has been merged into development
I cloned master into hotfixes, so we can maintain it untouched, in case anyone wants to legacy maintain it.

I think I am going to merge development into master and make it default branch, thoughts?
Ill figure out versioning first I guess and check make sure none of the manifests are using master a release, and using actual tags.

tablatronix and others added 28 commits September 4, 2018 16:39
@tablatronix
logging
8871bdd
@rodri16
Swapping enableAP and softAPConfig
5827c2f 
Swapping enableAP and softAPConfig for static IP STA
@tablatronix
update docblock to reflect setConfigPortalBlocking ignored configport…
0d8b96e 
…altimeout
@tablatronix
some testing
04552e4
@tablatronix
esp8266 2.3.0 compatability restored #576
97e7d30 
asyncscannetworks not available in esp8266 2.3.0, adjusted server on to take cstr for backwards compatability
@tablatronix
Merge branch 'development' of https://github.com/tzapu/WiFiManager in…
7f12e20 
…to development
@tablatronix
stopconfigportal public
c521860
@tablatronix
non blocking examples
ed80635
@tablatronix
change simple to basic clean up
2610dcb
@tablatronix
reworkgin examples
1e10ffa
@tablatronix
bug fixes #726
393e7e4
@tablatronix
remove sleep mode
9ce498c
@tablatronix
adds esp32 core temp, not enabled
4f0a87a 
the core temp sensors are not calibrated in production atm, they are large offsets form chip to chip and are useful for relative temp swings only. Until the IDF comes up with a new temp sense, this is commented out.
@irwanayeah
add listener setPreSaveConfigCallback
d9c27b9 
this listener required for action before save process behind wifi or params.
@irwanayeah
reformat
f9d1c9b
@fllaca
Added getParameters and getParametersCount methods.
b4cc27c 
Useful for iterating over WiFiManager parameter list
@fllaca
Use a especific version of ArduinoJson
448e079
@fllaca
Missing semicolon
12fc651
@fllaca
Rename "Old Examples" folder to "Old_Examples", to avoid errors when …
1c191c1 
…iterating examples folder.
syntax error in examples
c88df86
@tablatronix
added custom html param example pattern
0cd0b75
@tablatronix
Merge branch 'development' of https://github.com/tzapu/WiFiManager in…
9d00937 
…to development
@tablatronix
fix example
0e4af48
@tablatronix
Merge pull request #722 from rodri16/patch-2
b42b2f2 
Swapping enableAP and softAPConfig
@tablatronix
charset utf-8
34e1516
@dontsovcmc
WiFiManagerParameter init() to protected
aad1a8d
@dontsovcmc
example: custom paramaters with load/save settings
dbf91a4
@dontsovcmc
correct your idea about deflength
85b2319
tablatronix and others added 28 commits November 23, 2020 13:07
Merge branch 'development' into ota
35e9f41
add info page ota update
54904d3
testing basic auth
b34efd0
clean up debug lines
2c84651
missed one
12c114d
nother
fc48649
Remove debug
d8c7d2a
Moved debug strings no in flash, added WM_NODEBUG
321034b
dev v2.04 beta
16bd0f4
Merge branch 'development' into ota
506b3c4
@tablatronix
gitter
86a97d7
@tablatronix
badgers?
f0d3a24
@tablatronix
fixes #1164 thanks @fretzbiz
1fb70a9
@tablatronix
fixes #1169 for now
4e4942b
@tablatronix
fix ota handler string
e394283
@tablatronix
debugging testing country esp32
e071e3a
@tablatronix
Update README.md
82701d9
@egrekov
Fix. The library is not assembled under ESP8266
1e85c0e
@tablatronix
Merge pull request #1175 from egrekov/development
4d2a6b2 
Fix. The library is not assembled under ESP8266
@tablatronix
fixes #1177 oops
41cb00e
@tablatronix
fix bad code, this was not supposed to be commited, sorry
6e05a9f
#1158
0b68256
Fix warning
db74856
update esp info page
b3d4503
esp temp and hall test
e759a48
@tablatronix
Delete .DS_Store
6205ddc
Update .gitignore
0602cdc
Merge branch 'master' into development
28a0dcb
@tablatronix tablatronix merged commit 28a0dcb into master Jan 4, 2021
@tablatronix tablatronix mentioned this pull request Nov 29, 2022
Open
1 task
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
Branch This applies to a branch
Projects
None yet
Milestone
dev
Development

Successfully merging this pull request may close these issues.