summaryrefslogtreecommitdiff
path: root/app/controllers
AgeCommit message (Collapse)Author
2014-04-07Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
Conflicts: app/controllers/matches_controller.rb
2014-04-07Moved and updated the not-working asynchronous API auto-update feature.nfoy
2014-04-07stuffLuke Shumaker
2014-04-07MatchesController: skip peer review if there aren't enough players/teamLuke Shumaker
2014-04-07MstchesController: tidy up commentsLuke Shumaker
2014-04-07fix indentLuke Shumaker
2014-04-07It works. Users can do peer review.AndrewMurrell
2014-04-07Merge branch 'clean2'AndrewMurrell
Conflicts: app/views/matches/index.html.erb app/views/matches/show.html.erb
2014-04-07Ran generate.shAndrewMurrell
2014-04-07Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
Conflicts: app/controllers/matches_controller.rb app/views/matches/show.html.erb
2014-04-07Tournament advancement stuff. IT'S 4 AMguntasgrewal
2014-04-07Updated Generate and Re-added hoooksAndrewMurrell
2014-04-07updated matches controller and added hooksAndrewMurrell
2014-04-07Updated Peer Review -- Now allows review and scoring -- not tested because ↵AndrewMurrell
Davis can not yaml.
2014-04-07fix bugsguntasgrewal
2014-04-07fooguntasgrewal
2014-04-07Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-07lol# On branch mastertkimia
2014-04-07Matches move forward moreguntasgrewal
2014-04-06Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-04-06holy shit matches actually move forwardguntasgrewal
2014-04-06MatchesController: define matches_urlLuke Shumaker
2014-04-06indent the matches_controllerLuke Shumaker
2014-04-06matches starttkimia
2014-04-06Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
Conflicts: app/assets/stylesheets/matches.css.scss
2014-04-06some more graphicstkimia
2014-04-06Auto-Checking for a match's end is implemented.nfoy
2014-04-06started SVG generationtkimia
2014-04-06I swear I have fixed this beforeLuke Shumaker
2014-04-06implement editing the default user permissionsLuke Shumaker
2014-04-06Simplify the server controller and views, as it is a singular resourceLuke Shumaker
2014-04-06Merge branch 'clean2'Luke Shumaker
Conflicts: app/views/servers/show.html.erb
2014-04-06run generateLuke Shumaker
2014-04-06make editing user permissions workLuke Shumaker
2014-04-04fix issues in tournaments controllerLuke Shumaker
2014-04-04fix tournaments controllerLuke Shumaker
2014-04-04remove hold overs from the old permission systemLuke Shumaker
2014-04-04Merge branch 'clean2'Luke Shumaker
Conflicts: config/routes.rb db/schema.rb
2014-04-04run generate.shLuke Shumaker
2014-04-04Merge branch 'master' into lukeLuke Shumaker
Conflicts: app/controllers/application_controller.rb app/controllers/tournaments_controller.rb
2014-04-04re-jigger the TournamentController#update to be all one case blockLuke Shumaker
2014-04-04Implement the new security mechanismLuke Shumaker
2014-04-03Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-03matches table is back, and a lot of things are fixedtkimia
2014-04-03Merge branch 'master' of https://github.com/LukeShu/LeaguerDavisLWebb
2014-04-03CaptchaDavisLWebb
2014-04-03fixed some of andrews weird stuff with starting a tournamenttkimia
2014-04-03fix login with tokens belonging to sessionsshumakl
2014-04-03Merge 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-03normalize to tab indentshumakl
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-01 05:27:03 +0000