Updated trunk for new working version 2.14

git-svn-id: svn://192.168.202.10@2633 3d104415-ff17-0410-8863-d5cf3c621b8a

UPGRADE

@@ -1,5 +1,6 @@
 ################ UPGRADE
 
+NOTE: Upgrading from 2.11 to 2.13 is below the first section
 NOTE: Upgrading from 2.9 to 2.11 is below the first section
 NOTE: Upgrading from 2.7 to 2.9 is below the first section
 NOTE: Upgrading from 2.4 to 2.7 is below the first section
@@ -11,7 +12,57 @@ NOTE: Upgrading from 2.0.2 to 2.0.3 is below the fifth section
 NOTE: Upgrading from 2.0.1 to 2.0.2 is in the next section
 NOTE: Upgrading from 1.1.12-3 to 2.0.1 is at the bottom
 
-########## UPGRADING FROM 2.11 TO 2.12 ##########
+########## UPGRADING FROM 2.13 TO 2.14 ##########
+
+OPTIONAL STEPS(But highly recommended) - Backup existing system:
+
+1.  Run this for a 1-server system or server with database on it:  
+  (this may take hours on large system)
+   /usr/share/astguiclient/ADMIN_backup.pl --debugX
+
+2. Run this on dialer/Asterisk-only servers:
+  (do not run this if you only have one server):
+   /usr/share/astguiclient/ADMIN_backup.pl --debugX --without-db --without-web
+
+
+REQUIRED STEPS!!!
+
+1. Check system_settings, make sure you are at DB Schema Version 1478 or higher
+	If not, run the instructions for 2.11 to 2.13 before this section.
+
+2. upgrade the MySQL asterisk database(you have two options):
+    A. Running the upgrade file directly from Linux:
+	mysql -f --database=asterisk < /path/from/root/extras/upgrade_2.14.sql
+
+    B. Going into mysql and executing the upgrade sql file:
+	mysql
+	use asterisk
+	\. /path/from/root/extras/upgrade_2.14.sql
+	quit
+
+3. install new files:
+	perl ./install.pl
+	NOTES: If you have customized any scripts in the bin or agi folders, 
+	then make sure you back them up before running the install.pl script. 
+	This script will replace existing files in the astguiclient installation.
+
+4. For each of your ViciDial servers, go the Admin -> Servers -> Modify Server
+	page and set each one to "Rebuild conf files = Y" and click submit.
+	This will rebuild the conf files to ensure any changes are updated.
+
+5. On one server only, update your phone codes data:
+       /usr/share/astguiclient/ADMIN_area_code_populate.pl --purge-table --debug
+
+
+OTHER CHANGES:
+
+1. Nothing new here yet, just branched!
+
+
+
+
+
+########## UPGRADING FROM 2.11 TO 2.13 ##########
 
 OPTIONAL STEPS(But highly recommended) - Backup existing system:
 
@@ -314,7 +365,7 @@ OTHER CHANGES:
 
 
 
-########## UPGRADING FROM 2.9 TO 2.10 ##########
+########## UPGRADING FROM 2.9 TO 2.11 ##########
 
 OPTIONAL STEPS(But highly recommended) - Backup existing system:
 

extras/MySQL_AST_CREATE_tables.sql

@@ -3609,7 +3609,7 @@ INSERT INTO vicidial_inbound_groups(group_id,group_name,group_color,active,web_f
 INSERT INTO vicidial_lists SET list_id='999',list_name='Default inbound list',campaign_id='TESTCAMP',active='N';
 INSERT INTO vicidial_lists SET list_id='998',list_name='Default Manual list',campaign_id='TESTCAMP',active='N';
 
-INSERT INTO system_settings (version,install_date,first_login_trigger) values('2.12b0.5', CURDATE(), 'Y');
+INSERT INTO system_settings (version,install_date,first_login_trigger) values('2.14b0.5', CURDATE(), 'Y');
 
 INSERT INTO vicidial_status_categories (vsc_id,vsc_name) values('UNDEFINED','Default Category');
 
@@ -3831,4 +3831,4 @@ UPDATE vicidial_configuration set value='1766' where name='qc_database_version';
 
 UPDATE system_settings set vdc_agent_api_active='1';
 
-UPDATE system_settings SET db_schema_version='1478',db_schema_update_date=NOW(),reload_timestamp=NOW();
+UPDATE system_settings SET db_schema_version='1480',db_schema_update_date=NOW(),reload_timestamp=NOW();

extras/upgrade_2.14.sql

@@ -0,0 +1,3 @@
+UPDATE system_settings SET db_schema_version='1479',version='2.13rc1tk',db_schema_update_date=NOW() where db_schema_version < 1479;
+
+UPDATE system_settings SET db_schema_version='1480',version='2.14b0.5',db_schema_update_date=NOW() where db_schema_version < 1480;

extras/upgrade_manifest.txt

@@ -5,3 +5,4 @@ upgrade_2.6.sql 1316
 upgrade_2.8.sql 1347
 upgrade_2.10.sql 1378
 upgrade_2.12.sql 1403
+upgrade_2.14.sql 1478

version

@@ -1 +1 @@
-2.12b0.5
+2.14b0.5

www/agc/vicidial.php

@@ -532,10 +532,11 @@
 # 161102-1121 - Fixed QM partition problem
 # 161106-2221 - Changed to screen colors for main tab logo, other small style changes
 # 161117-1532 - Changed default main screen logo background color to white(screen color standard row 5)
+# 161126-2152 - Release of 2.13 stable branch and raising trunk to 2.14
 #
 
-$version = '2.12-501c';
+$version = '2.14-503c';
-$build = '161117-1532';
+$build = '161126-2152';
 $mel=1;					# Mysql Error Log enabled = 1
 $mysql_log_count=87;
 $one_mysql_log=0;

www/vicidial/admin.php

@@ -3895,12 +3895,13 @@ else
 # 161103-2204 - Added web_loader_phone_length and agent soundboards
 # 161106-2058 - Added agent_script
 # 161113-0900 - Changed script_id to 20 characters max, other small script changes
+# 161126-2157 - Release of 2.13 stable branch and raising trunk to 2.14
 #
 
 # make sure you have added a user to the vicidial_users MySQL table with at least user_level 9 to access this page the first time
 
-$admin_version = '2.12-575a';
+$admin_version = '2.14-577a';
-$build = '161113-0900';
+$build = '161126-2157';
 
 $STARTtime = date("U");
 $SQLdate = date("Y-m-d H:i:s");