summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-03-04Changed some username validation stuffDavisLWebb
2014-03-04Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-04routes has redirectionTomer Kimia
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-04itest gitguntasgrewal
2014-03-04oopsLuke Shumaker
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-04fix typos in commentsLuke 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-04don't run generate in start.sh, ignore nohup.outLuke 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 'clean'Luke Shumaker
Conflicts: generate.sh
2014-03-03fix index-adding migrations (I think), and fix `git add`ing schema.rbLuke Shumaker
2014-03-03Merge branch 'clean'Luke Shumaker
Conflicts: generate.sh
2014-03-03Have generate.sh to tricky git stuff, run itLuke Shumaker
also, stick in a couple of missing 'bundle exec's
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-03touch up Gemfile, comment out alternative testing frameworksLuke Shumaker
2014-03-03run ./generate.shLuke Shumaker
2014-03-03touch up the Gemfile, comment out alternative testing frameworksLuke Shumaker
2014-03-03Logout reconfiguredguntasgrewal
2014-03-03routes fixed signoutTomer Kimia
2014-03-03small thingsTomer Kimia
2014-03-03fiddle with generate.shLuke Shumaker
2014-03-03Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
Log out
2014-03-03Log out buttonguntasgrewal
2014-03-03links no longer look like shitTomer Kimia
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-03users_controller: indentLuke Shumaker
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 https://github.com/LukeShu/leaguerTomer Kimia
2014-03-03app/models/user.rb: indentLuke Shumaker
2014-03-03Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
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-03Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-03view stuffDavisLWebb
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-09 23:28:11 +0000