Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'release/1.2.7'

  • Loading branch information...
commit 5a0c0ca6e76c6c32d3332ecbfbfa5e1f72776c3f 2 parents 06314b3 + b480fdd
@Gipetto Gipetto authored
View
7 CHANGELOG.markdown
@@ -1,6 +1,11 @@
# OpenVBX Change Log
-## Next
+## OpenVBX 1.2.7
+
+- remove reference to $30 credit when signing up for a Twilio trial accounts
+
+
+## OpenVBX 1.2.6
- properly formulate gravatar urls when using https
- properly handle exceptions when calling GitHub for latest tag data during version check
View
4 INSTALL.markdown
@@ -30,7 +30,7 @@ Open your web browser and navigate to the URL of your OpenVBX installation. The
## Step 4: Connect to Twilio
-During the install process, you will be prompted for your Twilio API credentials. You can obtain your _Account SID_ and _Auth Token_ from your [Twilio Dashboard](https://www.twilio.com/user/account/). You must be logged into your Twilio account to access the dashboard. If you don't have a Twilio account [register for a free trial](https://www.twilio.com/try-twilio) and we'll include $30.00 worth of credit to help you get started.
+During the install process, you will be prompted for your Twilio API credentials. You can obtain your _Account SID_ and _Auth Token_ from your [Twilio Dashboard](https://www.twilio.com/user/account/). You must be logged into your Twilio account to access the dashboard. If you don't have a Twilio account [register for a free trial](https://www.twilio.com/try-twilio).
## Step 5: Login
@@ -112,7 +112,7 @@ OpenVBX requires a MySQL database. You should create a database, and a user with
## Connect to your Twilio account
-OpenVBX requires a Twilio account to enable provisioning phone numbers, sending and receiving voice calls, and sending and receiving SMS. If you don't have a Twilio account, [register for a free trial](https://www.twilio.com/try-twilio) and we'll include $30.00 worth of credit to help you get started.
+OpenVBX requires a Twilio account to enable provisioning phone numbers, sending and receiving voice calls, and sending and receiving SMS. If you don't have a Twilio account, [register for a free trial](https://www.twilio.com/try-twilio).
1. **Twilio SID:** This is your account identifier, it is unique to you and can be shared.
1. **Twilio Token:** This is the key to your Twilio account, it is private and should not be shared.
View
2  OpenVBX/config/config.php
@@ -30,7 +30,7 @@
| Used for asset url versioning.
|
*/
-$config['site_rev'] = 1022;
+$config['site_rev'] = 1023;
/*
|--------------------------------------------------------------------------
View
2  OpenVBX/config/version.php
@@ -1,3 +1,3 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
-$config['version'] = '1.2.6';
+$config['version'] = '1.2.7';
View
1  updates/75.sql
@@ -0,0 +1 @@
+UPDATE `settings` SET `value` = 75 WHERE `name` = 'schema-version';
Please sign in to comment.
Something went wrong with that request. Please try again.