Commits

Branch selector

 master

User selector

valderrama

Datepicker

All time

Commit History

Commits on Nov 5, 2011

• Added backend functionality to support different names for officers and members lists.

  valderrama

  committed
  11ec1f9

  Copy full SHA for 11ec1f9

• Fixed merge issues

  valderrama

  committed
  1c70814

  Copy full SHA for 1c70814

• Merge branch 'master' of github.com:plaza/Plaza

  valderrama

  committed
  3329e93

  Copy full SHA for 3329e93

• Changed complex queries to use get by sql and fixed badgesto be associated with events not users

  valderrama

  committed
  4bebe57

  Copy full SHA for 4bebe57

Commits on Oct 16, 2011

• removed instance variables

  valderrama

  committed
  7943045

  Copy full SHA for 7943045

• Added website and email, need to adjust styling

  valderrama

  committed
  43c5439

  Copy full SHA for 43c5439

Commits on Oct 8, 2011

• Fixed buggy merge of Alex As commits and mine

  valderrama

  committed
  100de19

  Copy full SHA for 100de19

• resolved conflicts

  valderrama

  committed
  79c3fd3

  Copy full SHA for 79c3fd3

• Basic events added. RERUN rake db:reset after pulling this commit because the seeding file has been updated with events and locations.

  valderrama

  committed
  4dc1eab

  Copy full SHA for 4dc1eab

Commits on Oct 3, 2011

• Merge branch 'master' of github.com:plaza/Plaza

  valderrama

  committed
  45a3356

  Copy full SHA for 45a3356

• Pulling master

  valderrama

  committed
  7435dc3

  Copy full SHA for 7435dc3

• Merge branch 'master' of github.com:plaza/Plaza

  valderrama

  committed
  aa88f95

  Copy full SHA for aa88f95

• pushing master

  valderrama

  committed
  21f6ccb

  Copy full SHA for 21f6ccb

Commits on Oct 2, 2011

• First prototype. Group pages now have title and about us added.

  valderrama

  committed
  78dd393

  Copy full SHA for 78dd393

• Generate groups controller scaffold and edited routes.rb to match

  valderrama

  committed
  86e41d8

  Copy full SHA for 86e41d8

• Added badges.Nneed to switch association of badges and events

  valderrama

  committed
  82e9415

  Copy full SHA for 82e9415

Commits on Sep 7, 2011

• Merge branch 'database-seeding' into database-schema

  valderrama

  committed
  19f71d3

  Copy full SHA for 19f71d3

• Modified git ignore csv data

  valderrama

  committed
  af01622

  Copy full SHA for af01622

• Finished with writing script to generate db/seeds.rb; to use execute the following command: ruby generate_seeds_rb.rb, then rake db:drop && rake db:create && rake db:migrate && rake db:seed; rake d…

  Show description for 17add6d
  valderrama

  committed
  17add6d

  Copy full SHA for 17add6d

Commits on Sep 5, 2011

• Removed type column, unnecessary

  valderrama

  committed
  e8a51a7

  Copy full SHA for e8a51a7

Commits on Sep 4, 2011

• Added the HABTM associations for users to groups and groups to events

  valderrama

  committed
  77c4e46

  Copy full SHA for 77c4e46

• added all columns not related to associations

  valderrama

  committed
  afd3e61

  Copy full SHA for afd3e61

• generated all models through rails

  valderrama

  committed
  5333109

  Copy full SHA for 5333109

Commits on Aug 26, 2011

• Merge branch 'master' into dev

  Show description for 66e5085
  valderrama

  committed
  66e5085

  Copy full SHA for 66e5085

• Modified README in dev

  valderrama

  committed
  1b15f5f

  Copy full SHA for 1b15f5f

• Modified README

  valderrama

  committed
  06bb24c

  Copy full SHA for 06bb24c

• Added rspec testing to gemfile and installed

  valderrama

  committed
  68d954b

  Copy full SHA for 68d954b

• Initial commit

  valderrama

  committed
  b5dcfea

  Copy full SHA for b5dcfea