summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-03-03Merge branch 'master' of https://github.com/LukeShu/leaguerTomer 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-03More documentation changesDavisLWebb
2014-03-03DOCUMENTATION FOR USER.RBDavisLWebb
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-02Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
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-02Users work 1000000000000% but there is a path issue with the htmlDavisLWebb
2014-03-02Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-02changed the generate.shDavisLWebb
2014-03-02Added Tournament Name.AndrewMurrell
2014-03-02I changed the user controllerDavisLWebb
2014-03-02Added --force flags for parts of the generator.AndrewMurrell
2014-03-02The start script is less obnoxious now.AndrewMurrell
2014-03-02Made the button on the homepage redirect to the signup page.AndrewMurrell
2014-03-02the users helper wasnt being pushDavisLWebb
2014-03-02Merge branch 'master' of https://github.com/LukeShu/leaguerTomer Kimia
2014-03-02THIS SHOULD COMMIT THE SESSION FILESDavisLWebb
2014-03-02"dont worry this merge is meaningless"Tomer Kimia
Merge branch 'master' of https://github.com/LukeShu/leaguer
2014-03-02fixed an issue in user controllerDavisLWebb
2014-03-02added abuttonTomer Kimia
2014-03-02Finished sessions and updated user modelDavisLWebb
2014-03-02Added Session controller and helper. Also update user to have a remember_tokenDavisLWebb
2014-03-02added debug info to bottom of viewsTomer Kimia
2014-03-02working pages by commenting include sessionhelperTomer Kimia
2014-03-02app html still hereTomer Kimia
2014-03-02container around body in htmlTomer Kimia
2014-03-02currently adding Session controller and viewDavisLWebb
2014-03-02Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
Conflicts: Gemfile.lock app/views/layouts/application.html.erb config/routes.rb
2014-03-02Gemfile.lockDavisLWebb
2014-03-02new homepage, better cssTomer Kimia
2014-03-02Not sure what this merge is... will investigateTomer Kimia
Merge branch 'master' of https://github.com/LukeShu/leaguer
2014-03-02added preliminary homepageTomer Kimia
2014-03-01Merge branch 'master' of github.com:LukeShu/leagerLuke Shumaker
2014-03-01doc/.gitignore: ignore generated documentationLuke Shumaker
2014-03-01mv docs docLuke Shumaker
2014-03-01quick and dirty cssTomer Kimia
2014-03-01Added bootstrap and games to routesTomer Kimia