Merge branch 'release/2.0.1'

SourceMod-Store · Jan 19, 2016 · 925c119 · 925c119
2 parents 45dcc7c + bb74c22
commit 925c119
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -31,5 +31,6 @@ install:
 before_script:
   - composer install
   - php artisan migrate
+  - php artisan migrate:refresh
 
 script: phpunit
diff --git a/database/migrations/2015_05_02_100000_store_create_tables.php b/database/migrations/2015_05_02_100000_store_create_tables.php
@@ -121,24 +121,6 @@ public function up()
 			$table->foreign('loadout_id')->references('id')->on('loadouts')
                 ->onUpdate('cascade')->onDelete('cascade');
         });
-
-		// Create table for store versions
-        Schema::connection('store')->create('versions', function (Blueprint $table) {
-            $table->engine = "InnoDB";
-            $table->increments('id');
-			$table->string('mod_name',64);
-			$table->string('mod_description',64)->nullable();
-			$table->string('mod_ver_convar',64)->nullable();
-			$table->string('mod_ver_number',64);
-			$table->integer('server_id')->unsigned();
-			$table->timestamp('last_updated');
-			$table->timestamps();
-
-			$table->unique(['mod_ver_convar', 'server_id']);
-
-            $table->foreign('server_id')->references('id')->on('servers')
-                ->onUpdate('cascade')->onDelete('cascade');
-        });
 
         // Create table for store servers
         Schema::connection('store')->create('servers', function (Blueprint $table) {
@@ -151,6 +133,24 @@ public function up()
             $table->timestamps();
         });
 
+        // Create table for store versions
+        Schema::connection('store')->create('versions', function (Blueprint $table) {
+            $table->engine = "InnoDB";
+            $table->increments('id');
+            $table->string('mod_name',64);
+            $table->string('mod_description',64)->nullable();
+            $table->string('mod_ver_convar',64)->nullable();
+            $table->string('mod_ver_number',64);
+            $table->integer('server_id')->unsigned();
+            $table->timestamp('last_updated');
+            $table->timestamps();
+
+            $table->unique(['mod_ver_convar', 'server_id']);
+
+            $table->foreign('server_id')->references('id')->on('servers')
+                ->onUpdate('cascade')->onDelete('cascade');
+        });
+
         // Create table for store server items
         Schema::connection('store')->create('servers_items', function (Blueprint $table) {
             $table->engine = "InnoDB";
@@ -194,11 +194,11 @@ public function down()
         Schema::connection('store')->drop('users_items');
         Schema::connection('store')->drop('servers_items');
         Schema::connection('store')->drop('servers_categories');
+        Schema::connection('store')->drop('versions');
         Schema::connection('store')->drop('servers');
         Schema::connection('store')->drop('items');
 		Schema::connection('store')->drop('categories');
         Schema::connection('store')->drop('users');
-		Schema::connection('store')->drop('versions');
 	}
 
 }
diff --git a/resources/views/templates/adminlte205/includes/cont-footer.blade.php b/resources/views/templates/adminlte205/includes/cont-footer.blade.php
@@ -15,6 +15,6 @@
 {{--You should have received a copy of the GNU Affero General Public License--}}
 {{--along with this program. If not, see <http://www.gnu.org/licenses/>.--}}
 <div class="pull-right hidden-xs">
-    <b>Version</b> 2.0.0
+    <b>Version</b> 2.0.1
 </div>
 Copyright &copy; 2013-2016  Store Plugin: <strong>Alon Gubkin</strong>, <strong>Keith Warren (Drixevel)</strong> - &copy; 2015-2016 WebPanel2: <strong>Werner Maisl</strong>. All rights reserved.