Set version to 1.8.2 and updated the changes list

2 files changed, 33 insertions, 2 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 879fee50c..5232deadc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,34 @@
+Version 1.8.2
+(December 21, 2011 from https://github.com/Elgg/Elgg/tree/1.8)
+
+ Enhancements:
+  * Added a 404 page
+  * Widgets controls now using the menu system
+  * Admins can edit users' account information
+  * Embed uploader supports uploading into groups
+  * Add a control panel widget for easy access to cache flushing and upgrading
+  * Comments now have a unqiue URL with fragment identifier
+  * JavaScript language files are cacheable
+  * jQuery form script only loaded when required
+
+ Bugfixes:
+  * Fixed default widgets
+  * Fixed activity filtering
+  * Embedding an image now inserts a medium sized image
+  * Search plugin only uses mbstring extension if enabled
+  * Site pages links returned to footer
+  * Fixed URL creation for users with non-ASCII characters in username
+  * The wire username parsing supports periods in usernames
+  * Returned the posting area to the main wire page
+  * Fixed layout issue on pages with a fragment identifier in URL
+  * Added support for call elgg_load_js() in header and footer
+  * Fixed user picker
+  * Fixed uservalidationbyemail plugin ignoring the actions of other plugins
+  * Fixed bug preventing the creation of admin users
+  * Fixed deleting a widget with JavaScript disabled
+  * Fixed many bugs in the unit/integration tests
+
+
 Version 1.8.1
 (November 16, 2011 from https://github.com/Elgg/Elgg/tree/1.8)
 
diff --git a/version.php b/version.php
index 59b5305dd..29870f93f 100644
--- a/version.php
+++ b/version.php
@@ -11,7 +11,7 @@
 
 // YYYYMMDD = Elgg Date
 // XX = Interim incrementer
-$version = 2011110700;
+$version = 2011122100;
 
 // Human-friendly version name
-$release = '1.8.1';
+$release = '1.8.2';