summaryrefslogtreecommitdiff
path: root/app/models
AgeCommit message (Collapse)Author
2014-03-04Changed some username validation stuffDavisLWebb
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-04oopsLuke Shumaker
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-04fix typos in commentsLuke 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-03app/models/user.rb: indentLuke Shumaker
2014-03-03More documentation changesDavisLWebb
2014-03-03DOCUMENTATION FOR USER.RBDavisLWebb
2014-03-03I added a lot of documentation to user.rbDavisLWebb
2014-03-02I changed the user controllerDavisLWebb
2014-03-02Added Session controller and helper. Also update user to have a remember_tokenDavisLWebb
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-01changed the user section of the generateDavisLWebb
2014-03-01user modelDavisLWebb
2014-02-27give tournaments a game typeLuke Shumaker
2014-02-27add game typesLuke Shumaker
2014-02-27add game typesLuke Shumaker
2014-02-26Possibly broke everything. Added another model for populating tournament ↵AndrewMurrell
options.
2014-02-20fix datatype names in generate.shDavisLWebb
2014-02-18Changes to generate.shAndrewMurrell
2014-02-18Added the generate shell command. Please do not commit the generated files.AndrewMurrell
2014-02-18Run `rails new`Luke Shumaker