Merge pull request #819 from ahilles107/v4.2.4

update files for 4.2.4 release
sourcefabric · Sep 23, 2014 · 1a6a0d3 · 1a6a0d3
2 parents 1328934 + 190ca29
commit 1a6a0d3
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -18,16 +18,16 @@ Quick links to our resources are:
 
 ## Installation
 
-The recommended way to install Newscoop is [through composer](http://getcomposer.org). 
+The recommended way to install Newscoop is [through composer](http://getcomposer.org).
 Just run the composer:
-    
+
     curl -s https://getcomposer.org/installer | php
     php composer.phar create-project sourcefabric/newscoop path/to/install dev-master
 
 ## How to contribute
 
 Only 4 steps:
- 
+
 * Fork sourcefabric/Newscoop repository - [how to fork][2].
 * Clone your fork
 * Create new local feature branch - [how to create branch][3]

diff --git a/newscoop/CREDITS.txt b/newscoop/CREDITS.txt
@@ -3,6 +3,12 @@ Copyright (C) 2002-2009 Media Development Loan Fund
 
 Newscoop Credits (by Version Number)
 
+-----------------------------------------
+Newscoop 4.2.4 Credits
+-----------------------------------------
+
+- Newscoop Team https://wiki.sourcefabric.org/display/CS/Developers+Team
+
 -----------------------------------------
 Newscoop 4.2.3 Credits
 -----------------------------------------

diff --git a/newscoop/ChangeLog.txt b/newscoop/ChangeLog.txt
@@ -1,3 +1,19 @@
+4.2.4 (Sep 23, 2014)
+  Prepare Newscoop 4.2.x for upgrade to Newscoop 4.3
+  Bug fixes
+ -------------
+ - IM-1572: Fixes the issue for non upgraded sites
+ - CS-5410: Sets config-dir parameter when URL is not valid and is handled via exception
+ - CS-5410: Removes testing code
+ - CS-5400: newscoop-restore script doesn't restore content of public/files folder
+ - CS-5418: newscoop-restore script breaks on mysql error
+ - CS-5365: Removes duplicate files (with same namespaces) from plugin
+ - CS-4914: Dates end in capital S in sample site
+ - AZ-31: Azerbaijani localization backport
+ - IM-1941: Preview iFrame with protocol agnostic url
+ - Backported Danish localization from master branch
+ - CS-5503 - Upgrading Newscoop from 4.2 -> 4.3 issues
+
 4.2.3 (May 19, 2014)
   Improvements
  -------------

diff --git a/newscoop/README.md b/newscoop/README.md
@@ -1,6 +1,6 @@
 Newscoop
-version     : 4.2.3
-release date: May 19, 2014 
+version     : 4.2.4
+release date: Sep 23, 2014
 contact     : [email protected]
 url         : http://www.sourcefabric.org
 copyright   : (C) 2010-2013 Sourcefabric o.p.s, 2004-2009 Media Development Loan Fund
@@ -63,9 +63,9 @@ See the INSTALL.txt file
 
 #Newscoop REST API
 
-Codename: Gimme  
-Full Name: Newscoop REST API  
-Endpoint: example.com/api/  
+Codename: Gimme
+Full Name: Newscoop REST API
+Endpoint: example.com/api/
 Documentation: https://wiki.sourcefabric.org/display/CS/Newscoop+REST+API+Reference
 
 ## Available SDK's

diff --git a/newscoop/library/Newscoop/Version.php b/newscoop/library/Newscoop/Version.php
@@ -11,7 +11,7 @@
  */
 class Version
 {
-    const VERSION = '4.2.3';
+    const VERSION = '4.2.4';
 
     /**
      * Compare version with current Newscoop version

diff --git a/newscoop/template_engine/classes/CampVersion.php b/newscoop/template_engine/classes/CampVersion.php
@@ -27,7 +27,7 @@ final class CampVersion
     /**
      * @var string
      */
-    private $m_release = '4.2.3';
+    private $m_release = '4.2.4';
 
     /**
      * @var string
@@ -42,7 +42,7 @@ final class CampVersion
     /**
      * @var string
      */
-    private $m_releaseDate = '2014-05-19';
+    private $m_releaseDate = '2014-09-23';
 
     /**
      * @var string