| Age | Commit message (Collapse) | Author |
|---|
|
Conflicts:
config/routes.rb
db/schema.rb
|
|
|
|
Conflicts:
app/controllers/alerts_controller.rb
app/controllers/application_controller.rb
app/controllers/matches_controller.rb
app/controllers/servers_controller.rb
app/controllers/sessions_controller.rb
app/controllers/tournaments_controller.rb
app/controllers/users_controller.rb
app/models/match.rb
app/models/team.rb
app/models/tournament.rb
app/views/sessions/_form.html.erb
app/views/sessions/index.html.erb
app/views/sessions/index.json.jbuilder
app/views/sessions/show.html.erb
app/views/sessions/show.json.jbuilder
app/views/tournaments/index.html.erb
config/routes.rb
generate.sh
|
|
|
|
|
|
|
|
|
|
Conflicts:
app/assets/stylesheets/scaffolds.css.scss
app/views/games/index.html.erb
db/migrate/20140304043618_create_servers.rb
db/migrate/20140304043622_create_matches.rb
db/migrate/20140304043631_create_games.rb
|
|
Conflicts:
app/assets/stylesheets/scaffolds.css.scss
app/assets/stylesheets/static.css.scss
app/controllers/sessions_controller.rb
app/controllers/static_controller.rb
app/controllers/tournaments_controller.rb
app/controllers/users_controller.rb
app/helpers/sessions_helper.rb
app/models/game.rb
app/models/user.rb
app/views/games/index.html.erb
app/views/tournaments/index.html.erb
app/views/tournaments/new.html.erb
app/views/users/_form.html.erb
app/views/users/index.html.erb
app/views/users/index.json.jbuilder
app/views/users/new.html.erb
app/views/users/show.html.erb
app/views/users/show.json.jbuilder
config/routes.rb
generate.sh
|
|
|
|
|
|
pages as well as getting the gameType listing to work.
|
|
|
|
Conflicts:
Gemfile.lock
app/views/layouts/application.html.erb
config/routes.rb
|
|
|
|
|
|
|
|
|
|
|
