This repository has been archived by the owner on Feb 11, 2022. It is now read-only.

Commits

Commits on Oct 28, 2019

Merge pull request #195 from novoda/update-dependencies
Ryan Feline
authoredOct 28, 2019

Commits on Oct 25, 2019

migrate to AndroidX
zegnus
committedOct 25, 2019
update dependencies
zegnus
committedOct 25, 2019

Commits on Dec 7, 2018

Update README.md
Ryan Feline
authoredDec 7, 2018

Commits on Nov 16, 2018

Merge pull request #185 from novoda/develop
Xavi Rigau
authoredNov 16, 2018
Disconnect when Http connection errors (#184 )

Ryan Feline
authored and
zegnus
committedNov 16, 2018

Commits on Nov 5, 2018

Merge pull request #183 from niltsiar/MER-168/concurrent_modification_exception
Ryan Feline
authoredNov 5, 2018
Merge branch 'develop' into MER-168/concurrent_modification_exception
Ryan Feline
authoredNov 5, 2018
Merge pull request #181 from niltsiar/update_readme
Ryan Feline
authoredNov 5, 2018
Merge branch 'develop' into update_readme
Ryan Feline
authoredNov 5, 2018
Merge pull request #182 from niltsiar/remove_releases_folder
Ryan Feline
authoredNov 5, 2018
Merge pull request #180 from niltsiar/update_readme
Ryan Feline
authoredNov 5, 2018

Commits on Nov 2, 2018

Returns a copy of registerables list in a Register to be safe while iterating over it
niltsiar
committedNov 2, 2018
Test to recreate the issue #168
niltsiar
committedNov 2, 2018
Remove releases folder
niltsiar
committedNov 2, 2018
Add warning about API changes in 1.1.8
niltsiar
committedNov 2, 2018
Update gradle configuration. Use implementation instead of compile
niltsiar
committedNov 2, 2018
Update MerlinService package
niltsiar
committedNov 2, 2018
Update released merlin version
niltsiar
committedNov 2, 2018
Update merlin header image path
niltsiar
committedNov 2, 2018

Commits on Oct 29, 2018

Merge pull request #179 from novoda/develop
Ryan Feline
authoredOct 29, 2018
Up version for release.
Ryan Feline
committedOct 29, 2018
Merge pull request #177 from novoda/MER-Feature-captive-portal-working-branch
juankysoriano
authoredOct 29, 2018
rename default endpoint to captive portal endpoint.
Ryan Feline
committedOct 29, 2018
Rename captive portal response code validator back to default.
Ryan Feline
committedOct 29, 2018
Rename back to default endpoint, now that merlin and merlinsBeard are aligned.
Ryan Feline
committedOct 29, 2018
Introduce a MerlinsBeard builder for declaring an endpoint.
Ryan Feline
committedOct 29, 2018
Rename captive portal to checking for internet access.
Ryan Feline
committedOct 29, 2018

Commits on Oct 26, 2018

Rename default to captivePortal.
Ryan Feline
committedOct 26, 2018
Merge branch 'MER-Feature-captive-portal-working-branch' of https://github.com/novoda/merlin into MER-Feature-captive-portal-working-branch
hcmsilva
committedOct 26, 2018
introduce a captive portal interface and update demo
hcmsilva
committedOct 26, 2018

Commits on Oct 25, 2018

use default.
Ryan Feline
committedOct 25, 2018
removed unnecessary refs
hcmsilva
committedOct 25, 2018
Merge branch 'MER-Feature-captive-portal-working-branch' of https://github.com/novoda/merlin into MER-Feature-captive-portal-working-branch
hcmsilva
committedOct 25, 2018
revert project files
hcmsilva
committedOct 25, 2018