From f9441a1ef2fa4a8db3ac449ad314ab01099fa12d Mon Sep 17 00:00:00 2001
From: Lloyd Hilaiel <lloyd@hilaiel.com>
Date: Mon, 14 May 2012 09:32:24 -0600
Subject: [PATCH] update ChangeLog with changes since train-2012.04.27

---
 ChangeLog | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d859a4af8..e0cfe914f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
-train-2012.05.09 (in progress):
-  *
+train-2012.05.14:
+  * Password is now requested in dialog for new user signup: #1000, #290
+  * "Key Performance Indicator" system implemented, to be disabled pending review: #1546, #1567
+  * Improve error handling: #1227, #1495
+  * code and test cleanup: #1521, #1547
+  * ToS and privacy policy display regardless of cookie settings: #1514
+  * Integrated new version of jwcrypto: #1543, #1544, #1545, #1552, #1574, #1575
+  * Android 4.0 cookie fixes: #1542
+  * Proper error display in IE6 & IE7: #1529
+  * Allow mysql password to be specified in environment: #1560
+  * Fix occasional dropped click during sign-in on chrome: #1581
 
 train-2012.04.27:
   * Observer API updated, still experimental.
-- 
GitLab