Merge pull request #3083 from live627/develop

Update version headers
elkarte · Dec 20, 2017 · 13359ce · 13359ce
2 parents 488938e + 0e76ad5
commit 13359ce
Show file tree

Hide file tree

Showing 447 changed files with 462 additions and 460 deletions.
diff --git a/SSI.php b/SSI.php
@@ -12,7 +12,7 @@
  * copyright:    2011 Simple Machines (http://www.simplemachines.org)
  * license:        BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/bootstrap.php b/bootstrap.php
@@ -11,7 +11,7 @@
  * copyright:	2011 Simple Machines (http://www.simplemachines.org)
  * license:		BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1.1
+ * @version 2.0 dev
  *
  */
 
@@ -90,10 +90,10 @@ private function setConstants()
 		define('ELKBOOT', '1');
 
 		// The software version
-		define('FORUM_VERSION', 'ElkArte 1.1.1');
+		define('FORUM_VERSION', 'ElkArte 2.0 dev');
 
 		// Shortcut for the browser cache stale
-		define('CACHE_STALE', '?R111');
+		define('CACHE_STALE', '?20dev');
 	}
 
 	/**

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
 	"name": "elkarte/elkarte",
 	"description": "ElkArte Forum Software application",
-	"version": "1.1.0-RC1",
+	"version": "2.0 dev",
 	"type": "project",
 	"keywords": ["elkarte", "forum"],
 	"homepage": "http://www.elkarte.net",

diff --git a/email_imap_cron.php b/email_imap_cron.php
@@ -8,7 +8,7 @@
  * @copyright ElkArte Forum contributors
  * @license   BSD http://opensource.org/licenses/BSD-3-Clause
  *
- * @version 1.1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/emailpost.php b/emailpost.php
@@ -15,7 +15,7 @@
  * @copyright ElkArte Forum contributors
  * @license   BSD http://opensource.org/licenses/BSD-3-Clause
  *
- * @version 1.1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/emailtopic.php b/emailtopic.php
@@ -15,7 +15,7 @@
  * @copyright ElkArte Forum contributors
  * @license   BSD http://opensource.org/licenses/BSD-3-Clause
  *
- * @version 1.1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/index.php b/index.php
@@ -13,7 +13,7 @@
  * copyright:	2011 Simple Machines (http://www.simplemachines.org)
  * license:		BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/install/CommonCode.php b/install/CommonCode.php
@@ -9,7 +9,7 @@
  * copyright:	2011 Simple Machines (http://www.simplemachines.org)
  * license:  	BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/install/DatabaseCode.php b/install/DatabaseCode.php
@@ -9,7 +9,7 @@
  * copyright:	2011 Simple Machines (http://www.simplemachines.org)
  * license:  	BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/install/Db-check-MySQL.php b/install/Db-check-MySQL.php
@@ -5,7 +5,7 @@
  * @copyright ElkArte Forum contributors
  * @license   BSD http://opensource.org/licenses/BSD-3-Clause
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/install/Db-check-PostgreSQL.php b/install/Db-check-PostgreSQL.php
@@ -5,7 +5,7 @@
  * @copyright ElkArte Forum contributors
  * @license   BSD http://opensource.org/licenses/BSD-3-Clause
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/install/Install_Controller.php b/install/Install_Controller.php
@@ -9,7 +9,7 @@
  * copyright:	2011 Simple Machines (http://www.simplemachines.org)
  * license:  	BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/install/LegacyCode.php b/install/LegacyCode.php
@@ -9,7 +9,7 @@
  * copyright:	2011 Simple Machines (http://www.simplemachines.org)
  * license:  	BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/install/TemplateInstall.php b/install/TemplateInstall.php
@@ -9,7 +9,7 @@
  * copyright:	2011 Simple Machines (http://www.simplemachines.org)
  * license:  	BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/install/TemplateUpgrade.php b/install/TemplateUpgrade.php
@@ -9,7 +9,7 @@
  * copyright:	2011 Simple Machines (http://www.simplemachines.org)
  * license:  	BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/install/ToRefactorCode.php b/install/ToRefactorCode.php
@@ -9,7 +9,7 @@
  * copyright:    2011 Simple Machines (http://www.simplemachines.org)
  * license:    BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/install/install.php b/install/install.php
@@ -9,7 +9,7 @@
  * copyright:	2011 Simple Machines (http://www.simplemachines.org)
  * license:  	BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/install/install_1-1.php b/install/install_1-1.php
@@ -9,7 +9,7 @@
  * copyright:	2011 Simple Machines (http://www.simplemachines.org)
  * license:  	BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/install/install_1-1_postgresql.php b/install/install_1-1_postgresql.php
@@ -9,7 +9,7 @@
  * copyright:	2011 Simple Machines (http://www.simplemachines.org)
  * license:  	BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/install/installcore.php b/install/installcore.php
@@ -5,13 +5,13 @@
  * @copyright ElkArte Forum contributors
  * @license   BSD http://opensource.org/licenses/BSD-3-Clause
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 
 // Version Constants
-const CURRENT_VERSION = '1.1';
-const CURRENT_LANG_VERSION = '1.1';
+const CURRENT_VERSION = '2.0 dev';
+const CURRENT_LANG_VERSION = '2.0 dev';
 const DB_SCRIPT_VERSION = '1-1';
 const REQUIRED_PHP_VERSION = '7.1.0';
 
@@ -27,5 +27,7 @@ function getUpgradeFiles()
 		array('upgrade_1-0_' . $db_type . '.php', '1.0', '1.0'),
 		array('upgrade_1-1.php', '1.1', CURRENT_VERSION),
 		array('upgrade_1-1_' . $db_type . '.php', '1.1', CURRENT_VERSION),
+		array('upgrade_1-1.php', '2.0 dev', CURRENT_VERSION),
+		array('upgrade_1-1_' . $db_type . '.php', '2.0 dev', CURRENT_VERSION),
 	);
 }
diff --git a/install/test_compression.php b/install/test_compression.php
@@ -9,7 +9,7 @@
  * copyright:	2011 Simple Machines (http://www.simplemachines.org)
  * license:  	BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1
+ * @version 2.0 dev
  */
 
 /**

diff --git a/install/upgrade.php b/install/upgrade.php
@@ -9,7 +9,7 @@
  * copyright:    2011 Simple Machines (http://www.simplemachines.org)
  * license:    BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/install/upgrade_1-0.php b/install/upgrade_1-0.php
@@ -9,7 +9,7 @@
  * copyright:	2011 Simple Machines (http://www.simplemachines.org)
  * license:  	BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/install/upgrade_1-1.php b/install/upgrade_1-1.php
@@ -9,7 +9,7 @@
  * copyright:	2011 Simple Machines (http://www.simplemachines.org)
  * license:  	BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/release_tools/generate_detailed-version.php b/release_tools/generate_detailed-version.php
@@ -5,7 +5,7 @@
  * @copyright ElkArte Forum contributors
  * @license   BSD http://opensource.org/licenses/BSD-3-Clause
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/sources/AbstractModel.php b/sources/AbstractModel.php
@@ -8,7 +8,7 @@
  * @copyright ElkArte Forum contributors
  * @license   BSD http://opensource.org/licenses/BSD-3-Clause
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/sources/Action.controller.php b/sources/Action.controller.php
@@ -7,7 +7,7 @@
  * @copyright ElkArte Forum contributors
  * @license   BSD http://opensource.org/licenses/BSD-3-Clause
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/sources/Autoloader.class.php b/sources/Autoloader.class.php
@@ -7,7 +7,7 @@
  * @copyright ElkArte Forum contributors
  * @license   BSD http://opensource.org/licenses/BSD-3-Clause
  *
- * @version 1.1
+ * @version 2.0 dev
  */
 
 /**

diff --git a/sources/BrowserDetector.class.php b/sources/BrowserDetector.class.php
@@ -11,7 +11,7 @@
  * copyright:	2011 Simple Machines (http://www.simplemachines.org)
  * license:		BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/sources/CurlFetchWebdata.class.php b/sources/CurlFetchWebdata.class.php
@@ -7,7 +7,7 @@
  * @copyright ElkArte Forum contributors
  * @license   BSD http://opensource.org/licenses/BSD-3-Clause
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/sources/Debug.class.php b/sources/Debug.class.php
@@ -12,7 +12,7 @@
  * copyright:	2011 Simple Machines (http://www.simplemachines.org)
  * license:  	BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/sources/DumpDatabase.php b/sources/DumpDatabase.php
@@ -11,7 +11,7 @@
  * copyright:	2011 Simple Machines (http://www.simplemachines.org)
  * license:		BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/sources/Errors.class.php b/sources/Errors.class.php
@@ -9,7 +9,7 @@
  * @copyright ElkArte Forum contributors
  * @license   BSD http://opensource.org/licenses/BSD-3-Clause
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/sources/FrontpageInterface.php b/sources/FrontpageInterface.php
@@ -8,7 +8,7 @@
  * @copyright ElkArte Forum contributors
  * @license   BSD http://opensource.org/licenses/BSD-3-Clause
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/sources/Hooks.class.php b/sources/Hooks.class.php
@@ -12,7 +12,7 @@
  * copyright:	2011 Simple Machines (http://www.simplemachines.org)
  * license:		BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/sources/Load.php b/sources/Load.php
@@ -11,7 +11,7 @@
  * copyright:	2011 Simple Machines (http://www.simplemachines.org)
  * license:		BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/sources/Logging.php b/sources/Logging.php
@@ -11,7 +11,7 @@
  * copyright:	2011 Simple Machines (http://www.simplemachines.org)
  * license:		BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/sources/QueryString.php b/sources/QueryString.php
@@ -12,7 +12,7 @@
  * copyright:	2011 Simple Machines (http://www.simplemachines.org)
  * license:		BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/sources/Request.php b/sources/Request.php
@@ -7,7 +7,7 @@
  * @copyright ElkArte Forum contributors
  * @license   BSD http://opensource.org/licenses/BSD-3-Clause
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/sources/Security.php b/sources/Security.php
@@ -12,7 +12,7 @@
  * copyright:	2011 Simple Machines (http://www.simplemachines.org)
  * license:		BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */
 

diff --git a/sources/Server.class.php b/sources/Server.class.php
@@ -11,7 +11,7 @@
  * copyright:	2011 Simple Machines (http://www.simplemachines.org)
  * license:		BSD, See included LICENSE.TXT for terms and conditions.
  *
- * @version 1.1
+ * @version 2.0 dev
  *
  */