summaryrefslogtreecommitdiffstats
path: root/packages/CaptivePortalLogin
Commit message (Expand)AuthorAgeFilesLines
* Import translations. DO NOT MERGEGeoff Mendal2015-06-105-6/+6
* Log SslErrors from captive portal sign in app.Paul Jensen2015-06-091-1/+4
* Add support for tel: links in captive portal app.Paul Jensen2015-06-091-0/+9
* Import translations. DO NOT MERGEGeoff Mendal2015-06-0877-462/+231
* Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-06-0377-0/+462
|\
| * Import translations. DO NOT MERGEGeoff Mendal2015-06-0377-0/+462
* | Disallow going back to initial empty page in captive portal appPaul Jensen2015-06-031-12/+25
|/
* Merge "Update captive portal sign-in app SSL error page UI." into mnc-devPaul Jensen2015-06-034-10/+70
|\
| * Update captive portal sign-in app SSL error page UI.Paul Jensen2015-06-034-10/+70
* | Import translations. DO NOT MERGEGeoff Mendal2015-05-301-0/+8
|/
* Don't leak NetworkListens in captive portal app.Paul Jensen2015-05-181-0/+11
* Add URL bar to captive portal login app.Paul Jensen2015-05-062-5/+17
* Merge commit '25a217c' into merge2Etan Cohen2015-04-242-40/+31
|\
| * Add captive portal API.Paul Jensen2015-04-162-40/+31
* | Import translations. DO NOT MERGEGeoff Mendal2015-04-223-0/+24
* | Merge commit 'e593d0a' into merge_workPrerepa Viswanadham2015-04-101-1/+1
|\ \ | |/
| * Deprecate static ConnectivityManager.get/setProcessDefaultNetwork() functions.Paul Jensen2015-04-021-1/+1
* | Import translations. DO NOT MERGEGeoff Mendal2015-03-2044-86/+51
* | Import translations. DO NOT MERGEGeoff Mendal2015-03-1829-58/+29
* | Import translations. DO NOT MERGEGeoff Mendal2015-03-1672-72/+144
* | am "Correct "Sign-in" and "Sign into" to "Sign in to"."Vinit Deshpande2015-03-153-3/+3
|\ \ | |/
| * Correct "Sign-in" and "Sign into" to "Sign in to".Paul Jensen2015-03-033-3/+3
* | Remove unused imports in frameworks/base.John Spurlock2015-02-281-2/+0
* | Import translations. DO NOT MERGEGeoff Mendal2015-01-211-1/+1
* | resolve merge conflicts of 87f5369 to master.Jorim Jaggi2015-01-151-1/+1
|\ \
| * \ am 792fd3d1: am 2b52cad1: Merge "Switch the connectivity check to its own hos...Lorenzo Colitti2015-01-141-1/+1
| |\ \ | | |/
| | * Switch the connectivity check to its own hostname.Lorenzo Colitti2015-01-141-1/+1
* | | Import translations. DO NOT MERGEGeoff Mendal2015-01-051-1/+1
* | | Import translations. DO NOT MERGEBaligh Uddin2014-12-231-1/+1
* | | am c266f62f: am eece3339: Merge "Show broken lock image when SSL errors are e...Paul Jensen2014-12-172-0/+15
|\ \ \ | |/ /
| * | am eece3339: Merge "Show broken lock image when SSL errors are encountered in...Paul Jensen2014-12-172-0/+15
| |\ \ | | |/
| | * Merge "Show broken lock image when SSL errors are encountered in CaptivePorta...Paul Jensen2014-12-172-0/+15
| | |\
| | | * Show broken lock image when SSL errors are encountered in CaptivePortalLogin.Paul Jensen2014-12-102-0/+15
* | | | am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into...Paul Jensen2014-12-111-24/+5
|\ \ \ \ | |/ / /
| * | | am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into...Paul Jensen2014-12-111-24/+5
| |\ \ \ | | |/ /
| | * | Fix several HTTP proxy issues with multinetworking.Paul Jensen2014-12-101-24/+5
| | |/
* | | am f19f90b2: am 58a493ac: am be3736d3: Merge "Don\'t let NetworkMonitor state...Paul Jensen2014-11-261-12/+27
|\ \ \ | |/ /
| * | am 58a493ac: am be3736d3: Merge "Don\'t let NetworkMonitor state stop user-in...Paul Jensen2014-11-261-12/+27
| |\ \ | | |/
| | * Don't let NetworkMonitor state stop user-initiated transitions.Paul Jensen2014-11-241-12/+27
* | | Import translations. DO NOT MERGEGeoff Mendal2014-11-171-1/+1
* | | Import translations. DO NOT MERGEGeoff Mendal2014-11-121-1/+1
* | | Import translations. DO NOT MERGEGeoff Mendal2014-11-101-1/+1
* | | Import translations. DO NOT MERGEBaligh Uddin2014-11-071-1/+1
* | | Import translations. DO NOT MERGEGeoff Mendal2014-10-201-1/+1
* | | Import translations. DO NOT MERGEGeoff Mendal2014-10-131-1/+1
* | | am 7f114608: am 35c19fb0: am 84527eca: am 69c489ed: am 7627d2cd: Merge "Use n...Paul Jensen2014-10-071-6/+76
|\ \ \ | |/ /
| * | am 35c19fb0: am 84527eca: am 69c489ed: am 7627d2cd: Merge "Use network-specif...Paul Jensen2014-10-071-6/+76
| |\ \ | | |/
| | * Use network-specific HTTP proxy settings in captive portal login app.Paul Jensen2014-10-031-6/+76
* | | Import translations. DO NOT MERGEGeoff Mendal2014-10-061-1/+1
* | | am 60c8c86d: am 8c4ba7c3: am 18434fcc: am a524b0f7: am 8df099df: Make Captive...Paul Jensen2014-10-012-1/+27
|\ \ \ | |/ /