Age | Commit message (Collapse) | Author | |
---|---|---|---|
2014-04-06 | some more graphics | tkimia | |
2014-04-06 | add a server settings button to the top bar if you have permission | Luke Shumaker | |
2014-04-04 | Merge branch 'clean2' | Luke Shumaker | |
Conflicts: config/routes.rb db/schema.rb | |||
2014-04-04 | run generate.sh | Luke Shumaker | |
2014-04-03 | footer clears on both sides, has top-margin of 10. Tournament show screen ↵ | tkimia | |
repetitive info fixed | |||
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-02 | now ran generate without ger | AndrewMurrell | |
2014-04-01 | AJAX is now working in the tournament loading page | Tomer Kimia | |
2014-03-30 | some more work on the styles | Tomer Kimia | |
2014-03-27 | ROUGH listing of tournaments | Tomer Kimia | |
2014-03-27 | New tournement start page | Tomer Kimia | |
2014-03-07 | notices in center, league of legends seed fixed | Tomer Kimia | |
2014-03-06 | defaults now come in | Tomer Kimia | |
2014-03-06 | login fixed and some views look better | Tomer Kimia | |
2014-03-06 | Minor visual changes | guntasgrewal | |
2014-03-05 | simplify with css more | Luke Shumaker | |
2014-03-05 | css is simpler than html (remove the hr above the footer, do it with css) | Luke Shumaker | |
2014-03-04 | fixed css conflict | Tomer Kimia | |
2014-03-04 | I REALLY hope I'm not overwriting anything | Tomer Kimia | |
Merge branch 'master' of https://github.com/LukeShu/leaguer Conflicts: app/assets/stylesheets/custom.css.scss | |||
2014-03-04 | some error styling | Tomer Kimia | |
2014-03-04 | Merge branch 'master' of https://github.com/LukeShu/leaguer | guntasgrewal | |
2014-03-04 | minor color changes | guntasgrewal | |
2014-03-04 | login/logout buttons | Luke Shumaker | |
2014-03-04 | Merge branch 'master' of http://github.com/LukeShu/leaguer | DavisLWebb | |
2014-03-04 | Changed some username validation stuff | DavisLWebb | |
2014-03-04 | Buttons fixed | guntasgrewal | |
2014-03-04 | Merge branch 'master' of http://github.com/LukeShu/leaguer | DavisLWebb | |
2014-03-04 | Log buttons | guntasgrewal | |
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 | Git is telling me to commit I dont know why | DavisLWebb | |
2014-03-04 | itest git | guntasgrewal | |
2014-03-04 | foo | Luke Shumaker | |
2014-03-04 | Merge branch 'master' of https://github.com/LukeShu/leaguer | guntasgrewal | |
Conflicts: app/assets/stylesheets/scaffolds.css.scss app/views/layouts/application.html.erb db/migrate/20140304043618_create_servers.rb db/migrate/20140304043622_create_matches.rb db/migrate/20140304043631_create_games.rb | |||
2014-03-04 | Use the navbar header to demonstrate using SCSS @extend | Luke Shumaker | |
2014-03-03 | Merge branch 'master' of github.com:LukeShu/leager | Luke Shumaker | |
Conflicts: app/controllers/users_controller.rb app/views/users/index.html.erb | |||
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 | run ./generate.sh | Luke Shumaker | |
2014-03-03 | small things | Tomer Kimia | |
2014-03-03 | Log out button | guntasgrewal | |
2014-03-03 | links no longer look like shit | Tomer Kimia | |
2014-03-02 | currently adding Session controller and view | DavisLWebb | |
2014-03-02 | Merge branch 'master' of http://github.com/LukeShu/leaguer | DavisLWebb | |
Conflicts: Gemfile.lock app/views/layouts/application.html.erb config/routes.rb | |||
2014-03-02 | new homepage, better css | Tomer Kimia | |
2014-03-02 | added preliminary homepage | Tomer Kimia | |
2014-03-01 | quick and dirty css | Tomer Kimia | |
2014-03-01 | Added bootstrap and games to routes | Tomer Kimia | |
2014-02-27 | add game types | Luke Shumaker | |
2014-02-18 | Changes to generate.sh | AndrewMurrell | |
2014-02-18 | Added the generate shell command. Please do not commit the generated files. | AndrewMurrell | |
2014-02-18 | Run `rails new` | Luke Shumaker | |