| Age | Commit message (Collapse) | Author |
|---|
|
|
|
|
|
|
|
Conflicts:
app/views/servers/show.html.erb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
config/routes.rb
db/schema.rb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
repetitive info fixed
|
|
|
|
|
|
start tournament button enables or disables based on players here.
|
|
|
|
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/views/tournaments/show.html.erb
|
|
|
|
|
|
|
|
|
