Pre-release updates

Update changelog & rev version number.
Fix typo in install docs.
Rev site version for CSS & JS url versioning.
Fix function name consistency in update scripts.
CSS updates for modern versions of IE.
Fix dial-timeout update to use add instead of set.

CHANGELOG.markdown

@@ -1,6 +1,6 @@
 # OpenVBX Change Log
 
-## Next
+## OpenVBX 1.2
 
 - redesign numbers screen to separate assigned, unassigned, and numbers in-use by other systems
 - change user edit screens to always use dedicated page instead of a popup
@@ -38,6 +38,7 @@
 - general html & css cleanup
 - fix for servers running on non-standard ports so that manually changing the `$config['cooke_path']` is no longer required to be able to log in
 - change .htaccess file's `mod_deflate` directives to exclude SWF files
+- CSS updates to bring modern versions of IE visually up to par with other browsers
 
 
 ## OpenVBX 1.1.3

INSTALL.markdown

@@ -96,7 +96,7 @@ OpenVBX requires the software listed below. It is all available for free and is
 1. **Config directory writable:** The configuration directory must be writable by the user your webserver is running as for the OpenVBX installation to complete. The path to the configuration directory is `<webroot>/OpenVBX/config`. On unix systems you can adjust the permissions with the `chown` and `chmod` commands.
 1. **SimpleXML support:** OpenVBX requires SimpleXML. If you don't meet this requirement, install the SimpleXML module.
 1. **JSON support:** OpenVBX requires JSON. If you don't meet this requirement install the JSON module.
-1. **Upload directory writable:** The upload directory must be writable by the user your webserver is running as for the OpenVBX installation to complete. The path to the configuration directory is `<webroot>/OpenVBX/audio-uploads`. On unix systems you can adjust the permissions with the `chown` and `chmod` commands.
+1. **Upload directory writable:** The upload directory must be writable by the user your webserver is running as for the OpenVBX installation to complete. The path to the configuration directory is `<webroot>/audio-uploads`. On unix systems you can adjust the permissions with the `chown` and `chmod` commands.
 1. **.htaccess File:** OpenVBX works best with Mod Rewrite enabled. If you've uploaded the contents of OpenVBX using an FTP application then its possible that the .htaccess file was ignored. If the .htaccess file is missing from your install copy the `htaccess_dist` file to `.htaccess` before beginning the install process. Some hosts do not run OpenVBX properly with Mod Rewrite disabled.
 
 

OpenVBX/config/config.php

@@ -30,7 +30,7 @@
 | Used for asset url versioning.
 |
 */
-$config['site_rev'] = 1016;
+$config['site_rev'] = 1017;
 
 /*
 |--------------------------------------------------------------------------

OpenVBX/config/version.php

@@ -1,3 +1,3 @@
 <?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 
-$config['version'] = '1.2b';
+$config['version'] = '1.2';

OpenVBX/controllers/settings/site.php

@@ -112,7 +112,7 @@ private function get_site()
 
 		$data = $this->init_view_data();
 		$current_settings = $this->get_current_settings();
-				
+
 		// insert the server's default time zone in the event none is saved
 		if (empty($current_settings['server_time_zone']))
 		{

README.markdown

@@ -35,7 +35,7 @@ written permission.
 # More Information
 -----------------------------
 Visit http://openvbx.org  
-Broccoli and gravy.
+Chick Peas and gravy.
 
 
 Please remember that your use of OpenVBX in connection with the Twilio 

assets/c/admin.css

@@ -207,8 +207,10 @@
 	text-decoration: none;
 	text-align: center;
 	background-color: #4B9727;
-	-moz-border-radius: 4px;
-	-webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+	-khtml-border-radius: 4px;
+	border-radius: 4px;
 }
 
 #completed-order .link-button img {
@@ -252,7 +254,6 @@
 	-webkit-border-radius: 4px; /* Saf3+, Chrome */
 	-khtml-border-radius: 4px; /* Konqueror */
 	border-radius: 4px; /* Standard. IE9 */
-
 	-webkit-background-clip: padding-box;
 	overflow: auto;
 }
@@ -464,6 +465,8 @@
     list-style: none;
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
+	-khtml-border-radius: 4px;
+	border-radius: 4px;
     background: #666;
     color: #FFF;
     padding: 8px 10px;
@@ -518,6 +521,8 @@
     border: 1px solid #000;
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
+	-khtml-border-radius: 4px;
+	border-radius: 4px;
 	overflow: auto;
 }
 
@@ -531,6 +536,8 @@
     border: 1px solid #333;
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
+	-khtml-border-radius: 4px;
+	border-radius: 4px;
     overflow: hidden;
 }
 
@@ -589,17 +596,21 @@
 	text-transform: uppercase;
 	background-color: #F0F0F0;
 	border: 1px dashed #999;
-	-moz-border-radius: 4px;
-	-webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+	-khtml-border-radius: 4px;
+	border-radius: 4px;
 }
 
 #flows-container .flows-list {
 	margin: 10px 0;
     padding: 10px;
 	background-color: #E1E1E1;
 	border: 1px solid #999;
-	-moz-border-radius: 4px;
-	-webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+	-khtml-border-radius: 4px;
+	border-radius: 4px;
 }
 
 #flows-container .flow {
@@ -610,6 +621,8 @@
     border: 1px solid #777;
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
+	-khtml-border-radius: 4px;
+	border-radius: 4px;
 	cursor: move;
 }
 

htaccess_dist

@@ -34,7 +34,7 @@
 	RewriteEngine ON
 
 	# Set this if you have your installation in a subdirectory
-	# RewriteBase /subdir
+	# RewriteBase /openvbx
 
 	# By default always use SSL
 	#RewriteCond %{HTTPS} !=on

updates/65.php

@@ -2,13 +2,13 @@
 
 function runUpdate_65()
 {
-	runUpdate_64_password_update();
+	runUpdate_65_password_update();
 
 	$ci =& get_instance();
 	$ci->vbx_settings->set('schema-version', '65', 1);
 }
 
-function runUpdate_64_password_update()
+function runUpdate_65_password_update()
 {
 	$ci =& get_instance();
 	$ci->load->dbforge();
@@ -23,7 +23,7 @@ function runUpdate_64_password_update()
 	));	
 }
 
-function runUpdate_64_add_dial_timeout()
+function runUpdate_65_add_dial_timeout()
 {
 	$ci =& get_instance();
 	$tenants = $ci->db
@@ -34,7 +34,7 @@ function runUpdate_64_add_dial_timeout()
 	{
 		foreach ($tenants as $tenant)
 		{
-			$ci->vbx_settings->set('dial_timeout', 15, $tenant->id);
+			$ci->vbx_settings->add('dial_timeout', 15, $tenant->id);
 		}
 	}
 }