summaryrefslogtreecommitdiff
path: root/app/views
AgeCommit message (Collapse)Author
2014-03-04sign out edit 2guntasgrewal
2014-03-04mergin' the wizardTomer Kimia
Merge branch 'master' of https://github.com/LukeShu/leaguer
2014-03-04signin gives error if user cannot sign inTomer Kimia
2014-03-04Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-03-04sign out link editedguntasgrewal
2014-03-04Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-04Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-03-04Buttons fixedguntasgrewal
2014-03-04Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-04Merge branch 'master' of github.com:LukeShu/leagerLuke Shumaker
2014-03-04show errors when signing upLuke Shumaker
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-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-04make notifications be shown an all pagesLuke Shumaker
2014-03-04indent application.html.erbLuke Shumaker
2014-03-04simplify the sessions routingLuke 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-03Logout reconfiguredguntasgrewal
2014-03-03small thingsTomer Kimia
2014-03-03Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
Log out
2014-03-03Log out buttonguntasgrewal
2014-03-03signed in people see a link to make a new tournamentTomer Kimia
2014-03-03dont see log in if logged inTomer Kimia
2014-03-03fixed users tableTomer Kimia
2014-03-03Changed password input to password type so that passwords are hidden as *** ↵Tomer Kimia
when typed, also why are we using an html form?
2014-03-03made two distinct buttons on homepageTomer Kimia
2014-03-03Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-03-03Added some partial rendering.AndrewMurrell
2014-03-03Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-03view stuffDavisLWebb
2014-03-03Made it possible to log in from the sign up page. As in I put a link under ↵AndrewMurrell
the mess I made.
2014-03-03Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-03Made it so 'log out' only appears if you're logged in.AndrewMurrell
2014-03-03I added a lot of documentation to user.rbDavisLWebb
2014-03-03Changed the views for tournament a little more.AndrewMurrell
2014-03-03Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-03What was broken has been reforged.AndrewMurrell
2014-03-03I HAVE THE WEBSITE RENDER THE USER'S USER NAMEDavisLWebb
2014-03-03Oops, also forgot this one.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-02Since I don't know how to do stuff with forms, I edited the actual HTML to ↵AndrewMurrell
fix where the form submits to. Tomer should help correct it.
2014-03-02Added Tournament Name.AndrewMurrell
2014-03-02I changed the user controllerDavisLWebb
generated by cgit v1.2.3-2-g168b (git 2.25.1) at 2024-10-30 19:42:09 +0000