Age | Commit message (Collapse) | Author |
|
|
|
Conflicts:
app/assets/stylesheets/matches.css.scss
|
|
|
|
Conflicts:
app/views/matches/show.html.erb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This way they can easily be ORed together, C-like.
|
|
|
|
Conflicts:
app/views/servers/show.html.erb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
config/routes.rb
db/schema.rb
|
|
|
|
|
|
Conflicts:
app/controllers/application_controller.rb
app/controllers/tournaments_controller.rb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
repetitive info fixed
|
|
|
|
|
|
|
|
start tournament button enables or disables based on players here.
|
|
|