summaryrefslogtreecommitdiff
path: root/app/assets
AgeCommit message (Collapse)Author
2014-04-06solved merge conflictsguntasgrewal
2014-04-06Dragging to Rankguntasgrewal
2014-04-06add a server settings button to the top bar if you have permissionLuke Shumaker
2014-04-04Merge branch 'clean2'Luke Shumaker
Conflicts: config/routes.rb db/schema.rb
2014-04-04run generate.shLuke Shumaker
2014-04-03footer clears on both sides, has top-margin of 10. Tournament show screen ↵tkimia
repetitive info fixed
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-02now ran generate without gerAndrewMurrell
2014-04-01AJAX is now working in the tournament loading pageTomer Kimia
2014-03-30some more work on the stylesTomer Kimia
2014-03-27ROUGH listing of tournamentsTomer Kimia
2014-03-27New tournement start pageTomer Kimia
2014-03-07notices in center, league of legends seed fixedTomer Kimia
2014-03-06defaults now come inTomer Kimia
2014-03-06login fixed and some views look betterTomer Kimia
2014-03-06Minor visual changesguntasgrewal
2014-03-05undelete more files that Davis accidentally deletedLuke Shumaker
2014-03-05simplify with css moreLuke Shumaker
2014-03-05css is simpler than html (remove the hr above the footer, do it with css)Luke Shumaker
2014-03-04fixed css conflictTomer Kimia
2014-03-04I REALLY hope I'm not overwriting anythingTomer Kimia
Merge branch 'master' of https://github.com/LukeShu/leaguer Conflicts: app/assets/stylesheets/custom.css.scss
2014-03-04some error stylingTomer Kimia
2014-03-04Merge branch 'master' of github.com:LukeShu/leagerLuke Shumaker
2014-03-04undelete application.jsLuke Shumaker
2014-03-04Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-03-04Here's to messing everything up.AndrewMurrell
2014-03-04Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-03-04minor color changesguntasgrewal
2014-03-04login/logout buttonsLuke Shumaker
2014-03-04Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-04Changed some username validation stuffDavisLWebb
2014-03-04Buttons fixedguntasgrewal
2014-03-04Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-04Log buttonsguntasgrewal
2014-03-04Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
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-04Git is telling me to commit I dont know whyDavisLWebb
2014-03-04itest gitguntasgrewal
2014-03-04fooLuke Shumaker
2014-03-04Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
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-04Use the navbar header to demonstrate using SCSS @extendLuke Shumaker
2014-03-03Merge branch 'master' of github.com:LukeShu/leagerLuke Shumaker
Conflicts: app/controllers/users_controller.rb app/views/users/index.html.erb
2014-03-03Merge 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-03run ./generate.shLuke Shumaker
2014-03-03small thingsTomer Kimia
2014-03-03Log out buttonguntasgrewal
2014-03-03links no longer look like shitTomer Kimia
2014-03-03Added some partial rendering.AndrewMurrell
2014-03-03Changed the views for tournament a little more.AndrewMurrell
2014-03-03Some of the stuff I forgot to commit last night. Updated and cleaned up some ↵AndrewMurrell
pages as well as getting the gameType listing to work.
2014-03-02currently adding Session controller and viewDavisLWebb
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 03:26:39 +0000