Age | Commit message (Collapse) | Author | |
---|---|---|---|
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 | 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-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 | 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 | some more work on the styles | Tomer Kimia | |
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 | 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-07 | small changes | Tomer Kimia | |
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 | tournaments table is better | Tomer Kimia | |
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 | Merge branch 'master' of http://github.com/LukeShu/leaguer | DavisLWebb | |
2014-03-07 | I changed a view | DavisLWebb | |
2014-03-06 | Fixed some merge errors in show.html.erb | AndrewMurrell | |
2014-03-06 | Redirection works as does the close tournament button. | AndrewMurrell | |
2014-03-06 | Merge branch 'master' of github.com:LukeShu/leaguer | Luke Shumaker | |
Conflicts: config/routes.rb | |||
2014-03-06 | Merge branch 'clean' | Luke Shumaker | |
Conflicts: app/controllers/tournaments_controller.rb | |||
2014-03-06 | make the join tables not have models | Luke Shumaker | |
2014-03-06 | tournament controller to matches redirect | AndrewMurrell | |
2014-03-06 | fix joining a tournament | Luke Shumaker | |
2014-03-06 | Merge branch 'master2' | Luke Shumaker | |
Conflicts: app/controllers/tournaments_controller.rb app/models/tournament.rb app/views/tournaments/_selected.html.erb app/views/tournaments/new.html.erb config/routes.rb | |||
2014-03-06 | Merge branch 'clean' | Luke Shumaker | |
Conflicts: app/controllers/tournaments_controller.rb app/views/teams/show.html.erb app/views/tournaments/index.html.erb config/routes.rb | |||
2014-03-06 | defaults now come in | Tomer Kimia | |
2014-03-06 | implement tournament joining | Luke Shumaker | |
2014-03-06 | Here's Luke's stuff because he doesn't have wifi. | AndrewMurrell | |
2014-03-06 | merge ready? | guntasgrewal | |
2014-03-06 | new generate | guntasgrewal | |
2014-03-06 | tournaments table only shows if tournaments exits | Tomer Kimia | |
2014-03-06 | login fixed and some views look better | Tomer Kimia | |
2014-03-06 | tournaments: fix game selection | Luke Shumaker | |
2014-03-06 | Minor visual changes | guntasgrewal | |
2014-03-04 | dynamic formgit add app/views/tournaments/new.html.erb ↵ | Tomer Kimia | |
app/views/tournaments/_selected.html.erb | |||
2014-03-04 | Here's to messing everything up. | AndrewMurrell | |
2014-03-04 | Merge branch 'master' of http://github.com/LukeShu/leaguer | DavisLWebb | |
Conflicts: app/assets/stylesheets/scaffolds.css.scss app/views/games/index.html.erb db/migrate/20140304043618_create_servers.rb db/migrate/20140304043622_create_matches.rb db/migrate/20140304043631_create_games.rb | |||
2014-03-04 | make notifications be shown an all pages | Luke Shumaker | |
2014-03-03 | Merge branch 'clean4' | Luke Shumaker | |
Conflicts: app/assets/stylesheets/scaffolds.css.scss app/assets/stylesheets/static.css.scss app/controllers/sessions_controller.rb app/controllers/static_controller.rb app/controllers/tournaments_controller.rb app/controllers/users_controller.rb app/helpers/sessions_helper.rb app/models/game.rb app/models/user.rb app/views/games/index.html.erb app/views/tournaments/index.html.erb app/views/tournaments/new.html.erb app/views/users/_form.html.erb app/views/users/index.html.erb app/views/users/index.json.jbuilder app/views/users/new.html.erb app/views/users/show.html.erb app/views/users/show.json.jbuilder config/routes.rb generate.sh | |||
2014-03-03 | Added some partial rendering. | AndrewMurrell | |