summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * Forbid javascript- and file-scheme intentsPaul Miller2015-04-063-55/+37
| | |/ | | | | | | | | | | | | | | | BUG:13082135 BUG:19296779 Change-Id: Ifea908b175670fbce65205797b93e87adf25bb3d
* | | am f415644a: am dc9c9582: Merge "Revert "Restrict "javascript" and "file" ↵Paul Miller2015-04-063-61/+55
|\ \ \ | |/ / | | | | | | | | | | | | | | | scheme intents"" * commit 'f415644a7045b81539b622f053a0828b57022fbc': Revert "Restrict "javascript" and "file" scheme intents"
| * | am dc9c9582: Merge "Revert "Restrict "javascript" and "file" scheme intents""Paul Miller2015-04-063-61/+55
| |\ \ | | |/ | | | | | | | | | * commit 'dc9c958256a66c333c1048ad21f1de8c1c0cdad3': Revert "Restrict "javascript" and "file" scheme intents"
| | * Merge "Revert "Restrict "javascript" and "file" scheme intents""Paul Miller2015-04-063-61/+55
| | |\
| | | * Revert "Restrict "javascript" and "file" scheme intents"Paul Miller2015-04-063-61/+55
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ca7ecd85ac925ef44dbef327310f2baad13322f2. Change-Id: I64460956e6243908a6c575eb4d3c7455efc86dff
* | | | am edc3e7a4: am b1da6cff: Merge "Restrict "javascript" and "file" scheme ↵Paul Miller2015-04-023-55/+61
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | intents" * commit 'edc3e7a47afdef95b483f656314829574e67727b': Restrict "javascript" and "file" scheme intents
| * | | am b1da6cff: Merge "Restrict "javascript" and "file" scheme intents"Paul Miller2015-04-023-55/+61
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'b1da6cff83eab4f707456fbdb0d64f28d26c4889': Restrict "javascript" and "file" scheme intents
| | * | Merge "Restrict "javascript" and "file" scheme intents"Paul Miller2015-04-023-55/+61
| | |\ \ | | | |/
| | | * Restrict "javascript" and "file" scheme intentsPaul Miller2015-04-023-55/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "javascript" is not allowed; "file" is only allowed in certain directories BUG:19296779 BUG:13082135 Change-Id: I389a5b0ad3e8add1b1159faca3212c7f11f3ae69
* | | | am 87dc5763: am 36180ed8: Merge "Finish removing "inline" URI scheme"Paul Miller2015-04-022-2/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '87dc57636cbac58ab9845260aee8a7ee951c6892': Finish removing "inline" URI scheme
| * | | am 36180ed8: Merge "Finish removing "inline" URI scheme"Paul Miller2015-04-012-2/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '36180ed8521a178ddf682a9cc831c072810d77ae': Finish removing "inline" URI scheme
| | * | Merge "Finish removing "inline" URI scheme"Paul Miller2015-04-012-2/+1
| | |\ \ | | | |/ | | |/|
| | | * Finish removing "inline" URI schemePaul Miller2015-04-012-2/+1
| | |/ | | | | | | | | | | | | | | | It was incompletely removed in 068e48b469f5abca53ee3da38f933cf2c25c93b8 Change-Id: Ie8816726cde8f898d69cd101cea66ddbb4b6e288
* | | am 5c91d966: am 0de964c4: Merge "browser: set security state even if user ↵Richard Coles2015-03-131-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | disable security alerts" * commit '5c91d966d472a88b553633c714fcb3ef2bdf892f': browser: set security state even if user disable security alerts
| * | am 0de964c4: Merge "browser: set security state even if user disable ↵Richard Coles2015-03-121-0/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | security alerts" * commit '0de964c432318947188f61a7b80963c70a787d9b': browser: set security state even if user disable security alerts
| | * Merge "browser: set security state even if user disable security alerts"Richard Coles2015-03-121-0/+1
| | |\
| | | * browser: set security state even if user disable security alertsJorge Ruesga2015-03-111-0/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | Even if a user disabled the security alerts (ssl errors), the security state SHOULD be set to show that the certificate has a problem. Actually, the certificate is reported as valid, which is complety wrong. Change-Id: I520bf2553942d04287d872428c4a73186ba1ceef Signed-off-by: Jorge Ruesga <j.ruesga.criado@gmail.com>
* | | am 39c70028: (-s ours) am 4ecb2d71: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-270-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit '39c700285f45c1f2396135159d376a1694713dfe': Import translations. DO NOT MERGE
| * | am 4ecb2d71: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-270-0/+0
| |\ \ | | |/ | | | | | | | | | * commit '4ecb2d7127ec7568c53a12132199baf13b2804b4': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEGeoff Mendal2015-02-2650-50/+50
| |/ | | | | | | | | Change-Id: Ie8f853c30e0096911a737dc69c69772cffa1d998 Auto-generated-cl: translation import
* | am 28994826: am f88fc286: Merge "Show JS alerts over their origin tab"Paul Miller2015-02-122-0/+29
|\ \ | |/ | | | | | | * commit '28994826925a627992d3140328e607ae85194edb': Show JS alerts over their origin tab
| * am f88fc286: Merge "Show JS alerts over their origin tab"Paul Miller2015-02-122-0/+29
| |\ | | | | | | | | | | | | * commit 'f88fc2863c2b42e254729fd1fab2808dcaa16b39': Show JS alerts over their origin tab
| | * Merge "Show JS alerts over their origin tab"Paul Miller2015-02-122-0/+29
| | |\
| | | * Show JS alerts over their origin tabPaul Miller2015-02-122-0/+29
| | |/ | | | | | | | | | | | | BUG:18416812 Change-Id: I25964690bdf579a4fd23fcb6e7c0f6681f0f3661
* | | am f463f043: am a9c8a585: Merge "Remove stray unused import."Narayan Kamath2015-01-071-1/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'f463f0438f98bae6c8d5d909f09a7807162e9ae9': Remove stray unused import.
| * | am a9c8a585: Merge "Remove stray unused import."Narayan Kamath2015-01-071-1/+0
| |\ \ | | |/ | | | | | | | | | * commit 'a9c8a585372f2c61270b515d4857a595012e0301': Remove stray unused import.
| | * Merge "Remove stray unused import."Narayan Kamath2015-01-071-1/+0
| | |\
| | | * Remove stray unused import.Narayan Kamath2015-01-071-1/+0
| | |/ | | | | | | | | | Change-Id: I52e2c41bec5131ecfb34fc9129888ca6678c3c2b
* | | am 715deeac: am de5a4d4a: Merge "Move browser over to java.net.URLConnection."Narayan Kamath2014-12-192-47/+62
|\ \ \ | |/ / | | | | | | | | | * commit '715deeacb019601d3570acb5a81db5c14c28d2f0': Move browser over to java.net.URLConnection.
| * | am de5a4d4a: Merge "Move browser over to java.net.URLConnection."Narayan Kamath2014-12-192-47/+62
| |\ \ | | |/ | | | | | | | | | * commit 'de5a4d4ac7a11708e1c93d6864c2447f029248fd': Move browser over to java.net.URLConnection.
| | * Merge "Move browser over to java.net.URLConnection."Narayan Kamath2014-12-192-47/+62
| | |\
| | | * Move browser over to java.net.URLConnection.Narayan Kamath2014-12-162-47/+62
| | |/ | | | | | | | | | | | | | | | bug: 18027885 Change-Id: Ie1db66432f0bd2b2eaaf2a7998828f69145645d9
* | | am fb8f3a90: am 3bf59298: Merge "Implement ↵Ben Murdoch2014-12-111-0/+18
|\ \ \ | |/ / | | | | | | | | | | | | | | | BrowserPreferencePage.isValidFragment." * commit 'fb8f3a9079d288f508338cd3df2eb7c872bb4fc0': Implement BrowserPreferencePage.isValidFragment.
| * | am 3bf59298: Merge "Implement BrowserPreferencePage.isValidFragment."Ben Murdoch2014-12-111-0/+18
| |\ \ | | |/ | | | | | | | | | * commit '3bf59298765b441ba3cd26f0731253962c190387': Implement BrowserPreferencePage.isValidFragment.
| | * Merge "Implement BrowserPreferencePage.isValidFragment."Ben Murdoch2014-12-111-0/+18
| | |\
| | | * Implement BrowserPreferencePage.isValidFragment.Ben Murdoch2014-12-111-0/+18
| | | | | | | | | | | | | | | | | | | | Bug: 18284779 Change-Id: I0f285e3577ce24784d45bbe35f45179febe27a9d
* | | | am f1077df4: am 5baac25e: Merge "Log an error when no activity is found to ↵Ben Murdoch2014-12-111-8/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | handle a URL." * commit 'f1077df463b0792dc9285286071b64f64ddbb623': Log an error when no activity is found to handle a URL.
| * | | am 5baac25e: Merge "Log an error when no activity is found to handle a URL."Ben Murdoch2014-12-111-8/+13
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '5baac25e0601e9894ee6fc690a9f6d0f534af4a2': Log an error when no activity is found to handle a URL.
| | * | Merge "Log an error when no activity is found to handle a URL."Ben Murdoch2014-12-111-8/+13
| | |\ \ | | | |/ | | |/|
| | | * Log an error when no activity is found to handle a URL.Ben Murdoch2014-12-111-8/+13
| | |/ | | | | | | | | | | | | | | | | | | Rather than crashing due to ActivityNotFoundException. Bug: 13930087 Change-Id: Id3af8301bb87298b885a24f70bf184abe4fc2a11
* | | am f2c4b5bb: am fe15d2a0: am e702d545: Merge "Rewrite calls to ↵Narayan Kamath2014-11-034-120/+77
|\ \ \ | |/ / | | | | | | | | | | | | | | | Proxy.getPreferredHttpHost" * commit 'f2c4b5bb1863ff1e001f36e3d263f28dc52f5a53': Rewrite calls to Proxy.getPreferredHttpHost
| * | am fe15d2a0: am e702d545: Merge "Rewrite calls to Proxy.getPreferredHttpHost"Narayan Kamath2014-11-034-120/+77
| |\ \ | | |/ | | | | | | | | | * commit 'fe15d2a0bf7b10a21a53a4e286f6bad5ccbce7d3': Rewrite calls to Proxy.getPreferredHttpHost
| | * am e702d545: Merge "Rewrite calls to Proxy.getPreferredHttpHost"Narayan Kamath2014-11-034-120/+77
| | |\ | | | | | | | | | | | | | | | | * commit 'e702d54594f8bd9472732c0ee35cd6503862633e': Rewrite calls to Proxy.getPreferredHttpHost
| | | * Merge "Rewrite calls to Proxy.getPreferredHttpHost"Narayan Kamath2014-11-034-120/+77
| | | |\
| | | | * Rewrite calls to Proxy.getPreferredHttpHostNarayan Kamath2014-10-274-120/+77
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use java.net.URLConnection which is the only maintained method of making http requests from java. These were the last calls to getPreferredHttpHost and that hidden API will now be deleted. Change-Id: I97e022507ba656f627754af4e889f4812314ea90
* | | | am bebff0d1: (-s ours) am 3c909ae2: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-310-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'bebff0d11c5a670cb24cd85e3fdbda5f4aac1739': Import translations. DO NOT MERGE
| * | | am 3c909ae2: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-310-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '3c909ae26804ba2403cf2b292b8968310558fc4b': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEBaligh Uddin2014-10-3050-50/+50
| | | | | | | | | | | | | | | | | | | | Change-Id: I97f50623444c023b843cc615ac252944bfc3ceca Auto-generated-cl: translation import
* | | | Merge "Added a check for an exception"Selim Gurun2014-10-281-1/+7
|\ \ \ \
| * | | | Added a check for an exceptionSelim Gurun2014-10-281-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:18074899 Change-Id: I6f602f37a622f5a86f3e9a33021c018a3aa93cb6
generated by cgit v1.1 at 2025-01-11 07:41:02 +0000