Bump version to 3.3.1. Add CHANGELOG file

diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644 (file)
index 0000000..165695f
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,29 @@
+Version 3.3.1
+
+       JSONP support for API (fabrixxm)
+       Fixed small bug in direct messages API (fabrixxm)
+       More filter for direct messages API (fabrixxm)
+       New hooks "getsiteinfo", "page_info_data" (annando)
+       Better loop post prevention (annando)
+       Via API, replace data: uri images in plain text version with link to post. (issue #1134) (fabrixxm)
+       Set default location to empty for new users. Suppress warning on user creation (issue #1193) (fabrixxm)
+       Correctly build urls with queries (issue #1190) (fabrixxm)
+       Optionally use keywords in feed as post tags with "remote self" (annando)
+       A blacklist of keywords to not use can be defined (annando)
+       "remote self" works also with Friendica and Diaspora contacts (annando)
+       Show exact post time after 12 hours (FX7)
+       Optionally redirect from non-SSL to SSL (annando)
+       Translation updates
+       Added CHANGELOG
+
+Version 3.3
+
+       See http://friendica.com/node/64
+
+Version 3.2
+
+       See http://friendica.com/node/61
+
+Version 3.1
+
+       See http://friendica.com/node/58
\ No newline at end of file

diff --git a/boot.php b/boot.php
index cde1220a5e7dc4ccc92fdf1c664c80649f346950..eb0eb3e6626c8025f0d54c91349c2666e9cfaa39 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -16,7 +16,7 @@ require_once('include/dbstructure.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME', 'Ginger');
-define ( 'FRIENDICA_VERSION',      '3.3' );
+define ( 'FRIENDICA_VERSION',      '3.3.1' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1174      );
 define ( 'EOL',                    "<br />\r\n"     );