Age | Commit message (Collapse) | Author | |
---|---|---|---|
2014-03-06 | Fixed the registration in the tourney model and fixed a lint int the controller. | AndrewMurrell | |
2014-03-06 | Fixed some merge errors in show.html.erb | AndrewMurrell | |
2014-03-06 | Redirection works as does the close tournament button. | AndrewMurrell | |
2014-03-06 | add self as a host to a tourney upon creation | Luke Shumaker | |
2014-03-06 | Merge branch 'master' of github.com:LukeShu/leaguer | Luke Shumaker | |
Conflicts: config/routes.rb | |||
2014-03-06 | tournaments setup started. NOT FINISHED | Tomer Kimia | |
2014-03-06 | Merge branch 'clean' | Luke Shumaker | |
Conflicts: app/controllers/tournaments_controller.rb | |||
2014-03-06 | make the join tables not have models | Luke Shumaker | |
2014-03-06 | tournament controller to matches redirect | AndrewMurrell | |
2014-03-06 | matches now belong to tournament | nfoy | |
2014-03-06 | Merge branch 'master' of https://github.com/LukeShu/leaguer | nfoy | |
Conflicts: config/routes.rb | |||
2014-03-06 | matches routed | nfoy | |
2014-03-06 | fix joining a tournament | Luke Shumaker | |
2014-03-06 | Merge branch 'master2' | Luke Shumaker | |
Conflicts: app/controllers/tournaments_controller.rb app/models/tournament.rb app/views/tournaments/_selected.html.erb app/views/tournaments/new.html.erb config/routes.rb | |||
2014-03-06 | Merge branch 'clean' | Luke Shumaker | |
Conflicts: app/controllers/tournaments_controller.rb app/views/teams/show.html.erb app/views/tournaments/index.html.erb config/routes.rb | |||
2014-03-06 | implement tournament joining | Luke Shumaker | |
2014-03-06 | Here's Luke's stuff because he doesn't have wifi. | AndrewMurrell | |
2014-03-06 | Merge branch 'master' of http://github.com/LukeShu/leaguer | DavisLWebb | |
Conflicts: app/controllers/sessions_controller.rb app/views/sessions/new.html.erb | |||
2014-03-06 | no | DavisLWebb | |
2014-03-06 | merge ready? | guntasgrewal | |
2014-03-06 | new generate | guntasgrewal | |
2014-03-06 | login fixed and some views look better | Tomer Kimia | |
2014-03-06 | tournaments: fix game selection | Luke Shumaker | |
2014-03-06 | Users can now log in with user_name and email but I could not make one text ↵ | DavisLWebb | |
box for both | |||
2014-03-06 | fix missing question-marks | Luke Shumaker | |
2014-03-05 | add access control to the controllers for alerts, servers, and tournaments | Luke Shumaker | |
2014-03-05 | users_controller: check permissions for doing things | Luke Shumaker | |
2014-03-05 | use separate migrations to make things hidden, add user#groups:integer | Luke Shumaker | |
2014-03-05 | move the separate migrations into the original generates | Luke Shumaker | |
2014-03-05 | Merge branch 'clean' | Luke Shumaker | |
Conflicts: app/controllers/sessions_controller.rb app/views/sessions/new.html.erb config/routes.rb | |||
2014-03-05 | make a session model as well as controller | Luke Shumaker | |
2014-03-04 | Here's to messing everything up. | AndrewMurrell | |
2014-03-04 | Merge branch 'master' of github.com:LukeShu/leager | Luke Shumaker | |
Conflicts: app/controllers/sessions_controller.rb | |||
2014-03-04 | fix SessionsController#create | Luke Shumaker | |
2014-03-04 | login works | Tomer Kimia | |
2014-03-04 | signin gives error if user cannot sign in | Tomer Kimia | |
2014-03-04 | simplify the sessions routing | Luke Shumaker | |
2014-03-03 | Merge branch 'master' of github.com:LukeShu/leager | Luke Shumaker | |
Conflicts: app/controllers/users_controller.rb app/views/users/index.html.erb | |||
2014-03-03 | Merge 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-03 | run ./generate.sh | Luke Shumaker | |
2014-03-03 | small things | Tomer Kimia | |
2014-03-03 | users_controller: indent | Luke Shumaker | |
2014-03-03 | fixed users table | Tomer Kimia | |
2014-03-03 | Added some partial rendering. | AndrewMurrell | |
2014-03-03 | More documentation changes | DavisLWebb | |
2014-03-02 | Users work 1000000000000% but there is a path issue with the html | DavisLWebb | |
2014-03-02 | Added Tournament Name. | AndrewMurrell | |
2014-03-02 | I changed the user controller | DavisLWebb | |
2014-03-02 | THIS SHOULD COMMIT THE SESSION FILES | DavisLWebb | |
2014-03-02 | fixed an issue in user controller | DavisLWebb | |