summaryrefslogtreecommitdiff
path: root/app/views/games
AgeCommit message (Collapse)Author
2014-04-27Merge 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-27ran ./generate.shLuke Shumaker
2014-04-26Merge branch 'clean2'Luke Shumaker
Conflicts: app/controllers/tournaments_controller.rb app/views/tournaments/index.html.erb app/views/tournaments/show.html.erb
2014-04-26run ./generate.shLuke Shumaker
2014-04-23Merge branch 'clean2'DavisLWebb
Conflicts: app/models/game.rb
2014-04-23run ./generate.shDavisLWebb
2014-04-22Merge 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-22run ./generate.shLuke Shumaker
2014-03-06merge ready?guntasgrewal
2014-03-06new generateguntasgrewal
2014-03-06login fixed and some views look betterTomer Kimia
2014-03-04games no longer has conflictTomer Kimia
2014-03-04Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
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
2014-03-04Git is telling me to commit I dont know whyDavisLWebb
2014-03-04fooLuke Shumaker
2014-03-04Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
Conflicts: app/assets/stylesheets/scaffolds.css.scss app/views/layouts/application.html.erb db/migrate/20140304043618_create_servers.rb db/migrate/20140304043622_create_matches.rb db/migrate/20140304043631_create_games.rb
2014-03-04make notifications be shown an all pagesLuke Shumaker
2014-03-03Merge branch 'clean4'Luke Shumaker
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
2014-03-03Log out buttonguntasgrewal
2014-03-02currently adding Session controller and viewDavisLWebb
2014-03-02Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
Conflicts: Gemfile.lock app/views/layouts/application.html.erb config/routes.rb
2014-03-01quick and dirty cssTomer Kimia
2014-02-27Added the Games Attributes stuff.AndrewMurrell
2014-02-27add game typesLuke Shumaker
generated by cgit v1.2.3-2-g168b (git 2.25.1) at 2024-11-02 16:13:39 +0000