Version 2.0-beta.10

ThinkUpLLC · Jan 14, 2014 · e92f6d5 · e92f6d5 · Ramoonus · Jan 20, 2014
1 parent fb99d44
commit e92f6d5
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 14 deletions.
diff --git a/docs/source/changelog/2.0-beta.10.rst b/docs/source/changelog/2.0-beta.10.rst
@@ -0,0 +1,14 @@
+2.0-beta.10 - 13 Jan 2014
+=========================
+
+
+Enhancements:
+-------------
+* Add user-level timezone in Settings > Account.
+* Receive insight email notifications on a per-user timezone basis.
+
+
+Bugfixes:
+---------
+* Fix broken links to insights in insight notification email.
+* Fix bug where insights disappeared on update (second generation).
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
 
+   2.0-beta.10
    2.0-beta.9
    2.0-beta.8
    2.0-beta.7

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

diff --git a/tests/migration-assertions.php b/tests/migration-assertions.php
@@ -29,8 +29,8 @@
  *
  * Database migration assertions to test during WebTestOfUpgradeDatabase
  */
-$LATEST_VERSION = '2.0-beta.9';
-$TOTAL_MIGRATION_COUNT = 293;
+$LATEST_VERSION = '2.0-beta.10';
+$TOTAL_MIGRATION_COUNT = 294;
 
 $MIGRATIONS = array(
     /* beta 0.1 */
@@ -1053,7 +1053,7 @@
 
      /* 2.0-beta.9 */
     '2.0-beta.9' => array(
-        'zip_url' => 'file://./build/thinkup.zip',
+        'zip_url' => 'https://thinkup.com/downloads/beta/thinkup-2.0-beta.9.zip',
         'migrations' => 0,
         'migration_assertions' => array(
             'sql' => array(
@@ -1154,5 +1154,27 @@
                 ),
             )
         )
+    ),
+
+     /* 2.0-beta.10 */
+    '2.0-beta.10' => array(
+        'zip_url' => 'file://./build/thinkup.zip',
+        'migrations' => 0,
+        'migration_assertions' => array(
+            'sql' => array(
+                array(
+                    // Add tu_owners.timezone field
+                    'query' => 'DESCRIBE tu_owners timezone;',
+                    'match' => "/varchar\(50\)/",
+                    'column' => 'Type',
+                ),
+                array(
+                    // Add tu_owners.membership_level field
+                    'query' => 'DESCRIBE tu_owners membership_level;',
+                    'match' => "/varchar\(20\)/",
+                    'column' => 'Type',
+                ),
+            )
+        )
     )
 );
diff --git a/webapp/install/sql/build-db_mysql-upcoming-release.sql b/webapp/install/sql/build-db_mysql-upcoming-release.sql
@@ -1,6 +1,6 @@
 -- 
 -- ThinkUp Database Creation Script
--- Auto-generated by thinkup/extras/scripts/migratedb script on 2014-01-03
+-- Auto-generated by thinkup/extras/scripts/migratedb script on 2014-01-13
 --
 
 ALTER DATABASE DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
@@ -569,13 +569,13 @@ CREATE TABLE tu_videos (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Videos which appear in posts.';
 
 
--- Dump completed on 2014-01-03 11:22:45
+-- Dump completed on 2014-01-13 21:40:37
 
 --
 -- Insert DB Version
 --
 INSERT INTO tu_options (namespace, option_name, option_value, last_updated, created)
-VALUES ('application_options', 'database_version', '2.0-beta.9', NOW(), NOW()); 
+VALUES ('application_options', 'database_version', '2.0-beta.10', NOW(), NOW()); 
 
 --
 -- Insert default plugin(s)

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 2013-12-16
+-- Auto-generated by thinkup/extras/scripts/migratedb script on 2014-01-13
 --
 
 ALTER DATABASE DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
@@ -146,9 +146,10 @@ CREATE TABLE tu_insights (
   id int(11) NOT NULL AUTO_INCREMENT COMMENT 'Internal unique ID.',
   instance_id int(11) NOT NULL COMMENT 'Instance ID.',
   slug varchar(100) NOT NULL COMMENT 'Identifier for a type of statistic.',
-  prefix varchar(255) NOT NULL COMMENT 'Prefix to the text content of the alert.',
+  headline varchar(255) NOT NULL COMMENT 'Headline of the insight content.',
   text text NOT NULL COMMENT 'Text content of the alert.',
   related_data text COMMENT 'Serialized related insight data, such as a list of users or a post.',
+  header_image varchar(255) DEFAULT NULL COMMENT 'Optional insight header image.',
   date date NOT NULL COMMENT 'Date of insight.',
   emphasis int(11) NOT NULL DEFAULT '0' COMMENT 'Level of emphasis for insight presentation.',
   filename varchar(100) DEFAULT NULL COMMENT 'Name of file that generates and displays insight.',
@@ -340,6 +341,8 @@ CREATE TABLE tu_owners (
   api_key varchar(32) NOT NULL COMMENT 'Key to authorize API calls.',
   api_key_private varchar(32) DEFAULT NULL COMMENT 'Optional non-user-facing API key.',
   email_notification_frequency varchar(10) DEFAULT 'daily' COMMENT 'How often to send email notifications (daily, weekly, both, never).',
+  timezone varchar(50) NOT NULL DEFAULT 'UTC' COMMENT 'Owner timezone.',
+  membership_level varchar(20) DEFAULT NULL COMMENT 'ThinkUp.com membership level.',
   PRIMARY KEY (id),
   UNIQUE KEY email (email)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='ThinkUp user account details.';
@@ -566,13 +569,13 @@ CREATE TABLE tu_videos (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Videos which appear in posts.';
 
 
--- Dump completed on 2013-12-16 16:30:16
+-- Dump completed on 2014-01-13 21:40:37
 
 --
 -- Insert DB Version
 --
 INSERT INTO tu_options (namespace, option_name, option_value, last_updated, created)
-VALUES ('application_options', 'database_version', '2.0-beta.9', NOW(), NOW()); 
+VALUES ('application_options', 'database_version', '2.0-beta.10', NOW(), NOW()); 
 
 --
 -- Insert default plugin(s)

diff --git a/webapp/install/sql/mysql_migrations/2013-12-16_create_photos_table_v2.0-beta.9.sql b/webapp/install/sql/mysql_migrations/2013-12-16_create_photos_table_v2.0-beta.9.sql
@@ -11,5 +11,5 @@ CREATE TABLE tu_photos (
     thumbnail_url varchar(255) COMMENT 'URL of thumbnail image file.',
     PRIMARY KEY (id),
     UNIQUE KEY post_key (post_key)
-) COMMENT='Photos posted by service users on a given network.';
+) ENGINE=MyISAM COMMENT='Photos posted by service users on a given network.';
 
diff --git a/...tions/2014-01-03_owners_tz_membership.sql → ...-03_owners_tz_membership_v2.0-beta.10.sql b/...tions/2014-01-03_owners_tz_membership.sql → ...-03_owners_tz_membership_v2.0-beta.10.sql
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-2013 Dwi Widiastuti, Gina Trapani, Guillaume Boudreau
  */
-$THINKUP_VERSION = '2.0-beta.9';
+$THINKUP_VERSION = '2.0-beta.10';
 $THINKUP_VERSION_REQUIRED['php'] = '5.2';
 $THINKUP_VERSION_REQUIRED['mysql'] = '5';