summaryrefslogtreecommitdiff
path: root/app/views
AgeCommit message (Collapse)Author
2014-04-06Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-04-06A few bug fixes, and a bunch of code that almost works.AndrewMurrell
2014-04-06Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-06matches starttkimia
2014-04-06Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-04-06small changesguntasgrewal
2014-04-06matches are given teams correctlytkimia
2014-04-06how 2 spell tournament?tkimia
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-06solved merge conflictsguntasgrewal
2014-04-06Dragging to Rankguntasgrewal
2014-04-06started SVG generationtkimia
2014-04-06Fixed match view, GUNTASDavisLWebb
2014-04-06add a server settings button to the top bar if you have permissionLuke Shumaker
2014-04-06implement editing the default user permissionsLuke Shumaker
2014-04-06oopsLuke 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-05Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-04-05Match status 1 pageguntasgrewal
2014-04-05Updated Settings, renaming, tournament views and misc.AndrewMurrell
2014-04-04remove hold overs from the old permission systemLuke Shumaker
2014-04-04Merge branch 'clean2'Luke Shumaker
2014-04-04run generate.shLuke Shumaker
2014-04-04Merge branch 'clean2'Luke Shumaker
Conflicts: config/routes.rb db/schema.rb
2014-04-04run generate.shLuke Shumaker
2014-04-04Cookie size 20 minutesguntasgrewal
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-03Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-03fixed some of andrews weird stuff with starting a tournamenttkimia
2014-04-03Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-04-03footer clears on both sides, has top-margin of 10. Tournament show screen ↵tkimia
repetitive info fixed
2014-04-03Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-04-03Added Gravatar support for tournament's index view.nfoy
2014-04-03small change in form (Set Rounds no longer viewable). AJAX fixed so that ↵tkimia
start tournament button enables or disables based on players here.
2014-04-03Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
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-03do things to avoid merge conflicts with clean2shumakl
2014-04-03Move things around between users and sessionsshumakl
2014-04-02now ran generate without gerAndrewMurrell
2014-04-01Merge branch 'master' of https://github.com/LukeShu/leaguerTomer Kimia
2014-04-01AJAX is now working in the tournament loading pageTomer Kimia
2014-04-01Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-04-01Edit Users now works. Added delayed_job gem.nfoy
generated by cgit v1.2.3-2-g168b (git 2.25.1) at 2024-10-30 18:19:13 +0000