summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-04-07Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-07your team is shown as light green in the tournament treetkimia
2014-04-07Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-04-07Added them yamlsguntasgrewal
2014-04-07MergedAndrewMurrell
2014-04-07Made settings work for league.AndrewMurrell
2014-04-07Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-07lol# On branch mastertkimia
2014-04-07Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-04-07Matches move forward moreguntasgrewal
2014-04-06Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-04-06Fixed Preferences.AndrewMurrell
2014-04-06Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-04-06holy shit matches actually move forwardguntasgrewal
2014-04-06Merge branch 'master' of github.com:LukeShu/leaguerLuke Shumaker
2014-04-06MatchesController: define matches_urlLuke Shumaker
2014-04-06indent the matches_controllerLuke Shumaker
2014-04-06Removed byebugAndrewMurrell
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-06Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
Conflicts: app/views/matches/show.html.erb
2014-04-06Auto-Checking for a match's end is implemented.nfoy
2014-04-06solved merge conflictsguntasgrewal
2014-04-06javascript files I did not writeguntasgrewal
2014-04-06Merge branch 'clean2'nfoy
2014-04-06Ran generatenfoy
2014-04-06Dragging to Rankguntasgrewal
2014-04-06generate stuff for delayed jobnfoy
2014-04-06pull changes to Gemfile from masternfoy
2014-04-06Merge remote-tracking branch 'origin/master'nfoy
2014-04-06add delayed_job_active_record to Gemfilenfoy
2014-04-06started SVG generationtkimia
2014-04-06Merge branch 'master' of github.com:LukeShu/leaguerLuke Shumaker
2014-04-06I swear I have fixed this beforeLuke Shumaker
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-06seed the server settingsLuke Shumaker
2014-04-06User.permission_bits: return 2^n instead of n for each.Luke Shumaker
This way they can easily be ORed together, C-like.
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
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-19 07:31:20 +0000