Version 1.0.7

ThinkUpLLC · Jun 9, 2012 · 58dc741 · 58dc741
1 parent d562b93
commit 58dc741
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 8 deletions.
diff --git a/docs/source/changelog/1.0.7.rst b/docs/source/changelog/1.0.7.rst
@@ -0,0 +1,12 @@
+1.0.7 - 7 Jun 2012
+==================
+
+Changelog:
+
+
+*   Twitter plugin: Fixed "error_text cannot be null" error during data capture
+*   Facebook plugin: Restore "Pages You Manage" to page dropdown
+*   Facebook plugin: Fixed bug in settings where site link included the 443 port when it shouldn't
+*   Fix broken image path references in jQuery CSS
+*   Fix JavaScript error which broke dashboard charts when there wasn't enough data
+*   Updated Google+ icon to current red version
diff --git a/docs/source/changelog/index.rst b/docs/source/changelog/index.rst
@@ -6,6 +6,7 @@ Check out what's new, fixed, and updated in each version release of ThinkUp.
 .. toctree::
    :maxdepth: 1
 
+   1.0.7
    1.0.6
    1.0.5
    1.0.4

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.0.6'
+version = '1.0.7'
 # The full version, including alpha/beta/rc tags.
-release = '1.0.6'
+release = '1.0.7'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/extras/scripts/generate-distribution b/extras/scripts/generate-distribution
@@ -23,6 +23,7 @@ rm -rf build/thinkup/plugins/*/tests/
 rm -rf build/thinkup/_lib/extlib/simpletest/
 rm -rf build/thinkup/test_installer/
 rm -rf build/thinkup/data/*
+rm build/thinkup/data/.ht*
 cp -R webapp/data/README.md build/thinkup/data/.
 rm -rf build/thinkup/config.inc.php
 
@@ -33,5 +34,5 @@ rm -rf build/thinkup/plugins/twitterrealtime/
 # Zip it up
 cd build/
 zip -r thinkup.zip thinkup 
-zip -d thinkup.zip __MACOSX* *.DS_Store *.ecoder_permissions_check.txt *.ht*
+zip -d thinkup.zip __MACOSX* *.DS_Store *.ecoder_permissions_check.txt
 rm -rf thinkup
diff --git a/tests/WebTestOfInstallation.php b/tests/WebTestOfInstallation.php
@@ -215,6 +215,7 @@ public function testSuccessfulInstallationInNonWritableFolder() {
         $this->assertTrue(file_exists($THINKUP_CFG['source_root_path'].
         '/webapp/test_installer/thinkup/config.inc.php'));
 
+        //$this->showSource();
         $this->assertText('ThinkUp has been installed successfully. Check your email account; an account activation '.
         'message has been sent.');
     }

diff --git a/tests/migration-assertions.php b/tests/migration-assertions.php
@@ -29,7 +29,7 @@
  *
  * Database migration assertions to test during WebTestOfUpgradeDatabase
  */
-$LATEST_VERSION = '1.0.5';
+$LATEST_VERSION = '1.0.7';
 $TOTAL_MIGRATION_COUNT = 218;
 
 $MIGRATIONS = array(
@@ -816,6 +816,12 @@
 
      /* 1.0.6 */
     '1.0.6' => array(
+        'zip_url' => 'https://github.com/downloads/ginatrapani/ThinkUp/thinkup_1.0.6.zip',
+        'migrations' => 0,
+     ),
+
+     /* 1.0.7 */
+    '1.0.7' => array(
         'zip_url' => 'file://./build/thinkup.zip',
         'migrations' => 0,
      ),

diff --git a/webapp/install/sql/build-db_mysql.sql b/webapp/install/sql/build-db_mysql.sql
@@ -1,6 +1,6 @@
 -- 
 -- ThinkUp Database Creation Script
--- Auto-generated by thinkup/extras/scripts/migratedb script on 2012-05-07
+-- Auto-generated by thinkup/extras/scripts/migratedb script on 2012-06-07
 --
 
 ALTER DATABASE DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
@@ -481,13 +481,13 @@ CREATE TABLE tu_users (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Service user details.';
 
 
--- Dump completed on 2012-05-07 13:34:53
+-- Dump completed on 2012-06-07 16:34:54
 
 --
 -- Insert DB Version
 --
 INSERT INTO tu_options (namespace, option_name, option_value, last_updated, created)
-VALUES ('application_options', 'database_version', '1.0.6', NOW(), NOW()); 
+VALUES ('application_options', 'database_version', '1.0.7', NOW(), NOW()); 
 
 --
 -- Insert default plugin(s)

diff --git a/webapp/install/version.php b/webapp/install/version.php
@@ -26,6 +26,6 @@
  * @license http://www.gnu.org/licenses/gpl.html
  * @copyright 2009-2012 Dwi Widiastuti, Gina Trapani, Guillaume Boudreau
  */
-$THINKUP_VERSION = '1.0.6';
+$THINKUP_VERSION = '1.0.7';
 $THINKUP_VERSION_REQUIRED['php'] = '5.2';
 $THINKUP_VERSION_REQUIRED['mysql'] = '5';