Age | Commit message (Collapse) | Author | |
---|---|---|---|
2014-04-04 | Implement the new security mechanism | Luke Shumaker | |
2014-04-03 | Merge branch 'master' of github.com:LukeShu/leaguer | shumakl | |
2014-04-03 | small 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-03 | Use the null object pattern for current_user when not logged in | shumakl | |
2014-04-03 | Merge branch 'master' of https://github.com/LukeShu/leaguer | tkimia | |
2014-04-03 | Users can't join twice | tkimia | |
2014-04-03 | Merge branch 'master' of https://github.com/LukeShu/leaguer | nfoy | |
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 | Move things around between users and sessions | shumakl | |
2014-04-02 | now ran generate without ger | 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 | Merge branch 'master' of https://github.com/LukeShu/leaguer | nfoy | |
2014-04-01 | Edit Users now works. Added delayed_job gem. | nfoy | |
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-27 | ROUGH listing of tournaments | 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 | 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-07 | small changes | Tomer Kimia | |
2014-03-07 | such progress, very bar | Tomer Kimia | |
Merge branch 'master' of https://github.com/LukeShu/leaguer | |||
2014-03-07 | FUCK IT WAS THE DAMN PERCENT IT COMES AFTER THE NUMBER NOT BEFORE WTF. the ↵ | Tomer Kimia | |
progress bar in the tournament is up | |||
2014-03-07 | Foy found my error '!=' not '==' in tournament model. | AndrewMurrell | |
2014-03-07 | tournaments table is better | Tomer Kimia | |
2014-03-07 | no conflicts: | Tomer Kimia | |
Merge branch 'master' of https://github.com/LukeShu/leaguer | |||
2014-03-07 | notices in center, league of legends seed fixed | Tomer Kimia | |
2014-03-07 | I think I fixed the issue with permissions. | AndrewMurrell | |
2014-03-07 | I changed some of the views for the tournaments and matches (like how match ↵ | DavisLWebb | |
creation asked for a winner) | |||
2014-03-07 | It is 1:30 AM | Luke Shumaker | |
2014-03-07 | Merge branch 'master' of http://github.com/LukeShu/leaguer | AndrewMurrell | |