Merge branch 'master' of https://github.com/LukeShu/leaguer

19 files changed, 14 insertions, 7 deletions

diff --git a/db/migrate/20140325214513_create_servers.rb b/db/migrate/20140401215718_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140325214513_create_servers.rb
+++ b/db/migrate/20140401215718_create_servers.rb
diff --git a/db/migrate/20140325214516_create_matches.rb b/db/migrate/20140401215720_create_matches.rb
index 30949a8..31eea12 100644
--- a/db/migrate/20140325214516_create_matches.rb
+++ b/db/migrate/20140401215720_create_matches.rb
@@ -5,6 +5,7 @@ class CreateMatches < ActiveRecord::Migration
       t.references :tournament, index: true
       t.string :name
       t.references :winner, index: true
+      t.string :remote_id
 
       t.timestamps
     end
diff --git a/db/migrate/20140325214518_create_teams.rb b/db/migrate/20140401215723_create_teams.rb
index fdf9a68..fdf9a68 100644
--- a/db/migrate/20140325214518_create_teams.rb
+++ b/db/migrate/20140401215723_create_teams.rb
diff --git a/db/migrate/20140325214521_create_alerts.rb b/db/migrate/20140401215725_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140325214521_create_alerts.rb
+++ b/db/migrate/20140401215725_create_alerts.rb
diff --git a/db/migrate/20140325214523_create_pms.rb b/db/migrate/20140401215728_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140325214523_create_pms.rb
+++ b/db/migrate/20140401215728_create_pms.rb
diff --git a/db/migrate/20140325214525_create_tournaments.rb b/db/migrate/20140401215730_create_tournaments.rb
index c0d8929..55f76a3 100644
--- a/db/migrate/20140325214525_create_tournaments.rb
+++ b/db/migrate/20140401215730_create_tournaments.rb
@@ -4,11 +4,6 @@ class CreateTournaments < ActiveRecord::Migration
       t.string :name
       t.references :game, index: true
       t.integer :status
-      t.integer :min_players_per_team
-      t.integer :max_players_per_team
-      t.integer :min_teams_per_match
-      t.integer :max_teams_per_match
-      t.integer :set_rounds
       t.boolean :randomized_teams
 
       t.timestamps
diff --git a/db/migrate/20140325214528_create_games.rb b/db/migrate/20140401215733_create_games.rb
index 5e4f56f..5e4f56f 100644
--- a/db/migrate/20140325214528_create_games.rb
+++ b/db/migrate/20140401215733_create_games.rb
diff --git a/db/migrate/20140325214531_create_users.rb b/db/migrate/20140401215735_create_users.rb
index 8032870..8032870 100644
--- a/db/migrate/20140325214531_create_users.rb
+++ b/db/migrate/20140401215735_create_users.rb
diff --git a/db/migrate/20140325214533_create_sessions.rb b/db/migrate/20140401215738_create_sessions.rb
index fe25bf2..fe25bf2 100644
--- a/db/migrate/20140325214533_create_sessions.rb
+++ b/db/migrate/20140401215738_create_sessions.rb
diff --git a/db/migrate/20140325214536_create_server_settings.rb b/db/migrate/20140401215740_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140325214536_create_server_settings.rb
+++ b/db/migrate/20140401215740_create_server_settings.rb
diff --git a/db/migrate/20140325214540_create_game_settings.rb b/db/migrate/20140401215743_create_game_settings.rb
index 0ebbf18..0ebbf18 100644
--- a/db/migrate/20140325214540_create_game_settings.rb
+++ b/db/migrate/20140401215743_create_game_settings.rb
diff --git a/db/migrate/20140325214538_create_tournament_options.rb b/db/migrate/20140401215745_create_tournament_preferences.rb
index 53b601c..991d659 100644
--- a/db/migrate/20140325214538_create_tournament_options.rb
+++ b/db/migrate/20140401215745_create_tournament_preferences.rb
@@ -1,6 +1,6 @@
-class CreateTournamentOptions < ActiveRecord::Migration
+class CreateTournamentPreferences < ActiveRecord::Migration
   def change
-    create_table :tournament_options do |t|
+    create_table :tournament_preferences do |t|
       t.references :tournament, index: true
       t.integer :vartype
       t.string :name
diff --git a/db/migrate/20140325214543_create_scores.rb b/db/migrate/20140401215747_create_scores.rb
index 4ca0b0b..4ca0b0b 100644
--- a/db/migrate/20140325214543_create_scores.rb
+++ b/db/migrate/20140401215747_create_scores.rb
diff --git a/db/migrate/20140401215750_create_remote_usernames.rb b/db/migrate/20140401215750_create_remote_usernames.rb
new file mode 100644
index 0000000..e265985
--- /dev/null
+++ b/db/migrate/20140401215750_create_remote_usernames.rb
@@ -0,0 +1,11 @@
+class CreateRemoteUsernames < ActiveRecord::Migration
+  def change
+    create_table :remote_usernames do |t|
+      t.references :game, index: true
+      t.references :user, index: true
+      t.text :json_value
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20140325214545_create_tournament_players_join_table.rb b/db/migrate/20140401215752_create_tournament_players_join_table.rb
index be240e8..be240e8 100644
--- a/db/migrate/20140325214545_create_tournament_players_join_table.rb
+++ b/db/migrate/20140401215752_create_tournament_players_join_table.rb
diff --git a/db/migrate/20140325214548_create_tournament_hosts_join_table.rb b/db/migrate/20140401215755_create_tournament_hosts_join_table.rb
index 7521d89..7521d89 100644
--- a/db/migrate/20140325214548_create_tournament_hosts_join_table.rb
+++ b/db/migrate/20140401215755_create_tournament_hosts_join_table.rb
diff --git a/db/migrate/20140325214550_create_team_user_join_table.rb b/db/migrate/20140401215757_create_team_user_join_table.rb
index f3b57fc..f3b57fc 100644
--- a/db/migrate/20140325214550_create_team_user_join_table.rb
+++ b/db/migrate/20140401215757_create_team_user_join_table.rb
diff --git a/db/migrate/20140325214553_create_match_team_join_table.rb b/db/migrate/20140401215800_create_match_team_join_table.rb
index c2ed1b7..c2ed1b7 100644
--- a/db/migrate/20140325214553_create_match_team_join_table.rb
+++ b/db/migrate/20140401215800_create_match_team_join_table.rb
diff --git a/db/migrate/20140325214602_add_hidden_attrs_to_user.rb b/db/migrate/20140401215809_add_hidden_attrs_to_user.rb
index 2f1b0b2..2f1b0b2 100644
--- a/db/migrate/20140325214602_add_hidden_attrs_to_user.rb
+++ b/db/migrate/20140401215809_add_hidden_attrs_to_user.rb