Age | Commit message (Collapse) | Author | |
---|---|---|---|
2014-04-27 | Merge branch 'clean2' | Luke Shumaker | |
Conflicts: app/controllers/tournaments_controller.rb app/views/tournaments/_form.html.erb app/views/tournaments/index.html.erb app/views/tournaments/show.html.erb | |||
2014-04-27 | ran ./generate.sh | Luke Shumaker | |
2014-04-26 | Merge branch 'clean2' | Luke Shumaker | |
Conflicts: app/controllers/tournaments_controller.rb app/views/tournaments/index.html.erb app/views/tournaments/show.html.erb | |||
2014-04-26 | run ./generate.sh | Luke Shumaker | |
2014-04-23 | Merge branch 'clean2' | DavisLWebb | |
Conflicts: app/models/game.rb | |||
2014-04-23 | run ./generate.sh | DavisLWebb | |
2014-04-22 | Merge branch 'clean2' | Luke Shumaker | |
Conflicts: app/controllers/tournaments_controller.rb app/models/match.rb app/views/matches/index.html.erb app/views/matches/show.html.erb app/views/tournaments/index.html.erb app/views/tournaments/show.html.erb | |||
2014-04-22 | run ./generate.sh | Luke Shumaker | |
2014-04-04 | Implement the new security mechanism | Luke Shumaker | |
2014-04-03 | normalize to tab indent | shumakl | |
2014-04-03 | run generate.sh | shumakl | |
2014-03-06 | new generate | guntasgrewal | |
2014-03-02 | currently adding Session controller and view | DavisLWebb | |
2014-03-02 | Merge branch 'master' of http://github.com/LukeShu/leaguer | DavisLWebb | |
Conflicts: Gemfile.lock app/views/layouts/application.html.erb config/routes.rb | |||
2014-02-27 | Added the Games Attributes stuff. | AndrewMurrell | |
2014-02-27 | add game types | Luke Shumaker | |