Age | Commit message (Collapse) | Author | |
---|---|---|---|
2014-04-03 | fix login with tokens belonging to sessions | shumakl | |
2014-04-03 | fix auto-indent mess up | shumakl | |
2014-04-03 | Merge branch 'clean2' | shumakl | |
Conflicts: app/controllers/alerts_controller.rb app/controllers/application_controller.rb app/controllers/matches_controller.rb app/controllers/servers_controller.rb app/controllers/sessions_controller.rb app/controllers/tournaments_controller.rb app/controllers/users_controller.rb app/models/match.rb app/models/team.rb app/models/tournament.rb app/views/sessions/_form.html.erb app/views/sessions/index.html.erb app/views/sessions/index.json.jbuilder app/views/sessions/show.html.erb app/views/sessions/show.json.jbuilder app/views/tournaments/index.html.erb config/routes.rb generate.sh | |||
2014-04-03 | do things to avoid merge conflicts with clean2 | shumakl | |
2014-04-03 | normalize to tab indent | shumakl | |
2014-04-03 | run generate.sh | shumakl | |
2014-04-03 | modify generate.sh to use tab-indent in the app/ directory | shumakl | |
2014-04-03 | Move things around between users and sessions | shumakl | |
2014-04-02 | Merge branch 'master' of https://github.com/LukeShu/leaguer | tkimia | |
2014-04-02 | now ran generate without ger | AndrewMurrell | |
2014-04-01 | fixed generate -- not run yet | AndrewMurrell | |
2014-04-01 | Merge branch 'master' of https://github.com/LukeShu/leaguer | Tomer Kimia | |
2014-04-01 | AJAX is now working in the tournament loading page | Tomer Kimia | |
2014-04-01 | Removed ger | AndrewMurrell | |
2014-04-01 | oops, removed ger | AndrewMurrell | |
2014-04-01 | Merge branch 'master' of http://github.com/LukeShu/leaguer | AndrewMurrell | |
2014-04-01 | Settled Merge Conflicts. | AndrewMurrell | |
2014-04-01 | players can now leave tournaments | Tomer Kimia | |
2014-04-01 | Re-ran generate. | AndrewMurrell | |
2014-03-30 | Merge branch 'master' of https://github.com/LukeShu/leaguer | Tomer Kimia | |
2014-03-30 | some more work on the styles | Tomer Kimia | |
2014-03-30 | Gravitar images added to user pages. | nfoy | |
2014-03-29 | Added remote login table for handling remote usernames. | AndrewMurrell | |
2014-03-27 | Updated Generate | AndrewMurrell | |
2014-03-27 | ROUGH listing of tournaments | Tomer Kimia | |
2014-03-27 | Merge branch 'master' of https://github.com/LukeShu/leaguer | Tomer Kimia | |
2014-03-27 | Merge branch 'master' of https://github.com/LukeShu/leaguer | Tomer Kimia | |
Conflicts: app/views/tournaments/show.html.erb | |||
2014-03-27 | Dog | DavisLWebb | |
2014-03-27 | Doing this to see if it works | DavisLWebb | |
2014-03-27 | New tournement start page | Tomer Kimia | |
2014-03-25 | Adding match status after solving conflicts | guntasgrewal | |
2014-03-25 | Match Status added | guntasgrewal | |
2014-03-25 | revert Guntas | AndrewMurrell | |
2014-03-25 | added match status | guntasgrewal | |
2014-03-25 | Tournament Name added | guntasgrewal | |
2014-03-25 | Tournament has a NAME now | guntasgrewal | |
2014-03-25 | Merge branch 'clean' | guntasgrewal | |
2014-03-25 | Changes to generate.sh | guntasgrewal | |
2014-03-10 | Merge branch 'master' of http://github.com/LukeShu/leaguer | AndrewMurrell | |
2014-03-10 | Final upload of files. | AndrewMurrell | |
2014-03-10 | Merge branch 'master' of https://github.com/LukeShu/leaguer | nfoy | |
2014-03-10 | User story additions and specifications. | nfoy | |
2014-03-10 | write about the permissions system | Luke Shumaker | |
2014-03-10 | Merge branch 'master' of github.com:LukeShu/leager | Luke Shumaker | |
2014-03-10 | fix bad merge | Luke Shumaker | |
2014-03-10 | Merge branch 'master' of https://github.com/LukeShu/leaguer | guntasgrewal | |
2014-03-10 | Small change in tourny view | guntasgrewal | |
2014-03-10 | Merge branch 'master' of github.com:LukeShu/leager | Luke Shumaker | |
2014-03-10 | write areas for improvement | Luke Shumaker | |
2014-03-10 | Added those 2 sections. | AndrewMurrell | |