summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-08-27 17:20:20 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-08-27 17:20:20 +0200
commitc3757b80ebe76ab3807933901cda0e9b7a405690 (patch)
treedacec48f5f138618561e02dcf50764bcc2556506
parentb183ece10dcde599c04af412f0f5c1c776ed29d8 (diff)
parent95b7994a298a7c57118c59e03a1aa43bd804bce4 (diff)
Merge pull request #321 from Symvaro/develop
add Android user agent
-rw-r--r--application/config/user_agents.php1
-rw-r--r--user_guide/changelog.html1
2 files changed, 2 insertions, 0 deletions
diff --git a/application/config/user_agents.php b/application/config/user_agents.php
index e2d3c3af0..4746f2fcd 100644
--- a/application/config/user_agents.php
+++ b/application/config/user_agents.php
@@ -126,6 +126,7 @@ $mobiles = array(
'sendo' => "Sendo",
// Operating Systems
+ 'android' => "Android",
'symbian' => "Symbian",
'SymbianOS' => "SymbianOS",
'elaine' => "Palm",
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 33e0a62c1..978b710be 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -65,6 +65,7 @@ Change Log
<ul>
<li>General Changes
<ul>
+ <li class="reactor">Added Android to the list of user agents.</li>
<li class="reactor">Callback validation rules can now accept parameters like any other validation rule.</li>
<li class="reactor">Ability to log certain error types, not all under a threshold.</li>
<li class="reactor">Added html_escape() to <a href="general/common_functions.html">Common functions</a> to escape HTML output for preventing XSS.</li>