Commits on Nov 5, 2011
  1. @valderrama
  2. @valderrama

    Fixed merge issues

    valderrama committed Nov 4, 2011
  3. @valderrama
  4. @valderrama

    Changed complex queries to use get by sql and fixed badgesto be assoc…

    …iated with events not users
    valderrama committed Nov 4, 2011
Commits on Oct 18, 2011
  1. @alexanderatallah
  2. @alexanderatallah

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

    Conflicts:
    	app/views/groups/show.html.erb
    alexanderatallah committed Oct 18, 2011
  3. @alexanderatallah
Commits on Oct 16, 2011
  1. @valderrama

    removed instance variables

    valderrama committed Oct 16, 2011
  2. @valderrama
Commits on Oct 8, 2011
  1. @valderrama
  2. @valderrama

    resolved conflicts

    valderrama committed Oct 8, 2011
  3. @valderrama

    Basic events added. RERUN rake db:reset after pulling this commit bec…

    …ause the seeding file has been updated with events and locations.
    valderrama committed Oct 8, 2011
  4. @alexanderatallah
  5. @alexanderatallah
  6. @alexanderatallah
Commits on Oct 3, 2011
  1. @valderrama
  2. @valderrama

    Pulling master

    valderrama committed Oct 2, 2011
  3. @alexanderatallah
  4. @alexanderatallah
  5. @valderrama
  6. @valderrama

    pushing master

    valderrama committed Oct 2, 2011
Commits on Oct 2, 2011
  1. @alexanderatallah

    Google Analytics

    alexanderatallah committed Oct 2, 2011
  2. @valderrama
  3. @alexanderatallah
  4. @valderrama
  5. @valderrama
Commits on Sep 7, 2011
  1. @valderrama
  2. @valderrama
  3. @valderrama

    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 db:reset might also work
    valderrama committed Sep 7, 2011
Commits on Sep 5, 2011
  1. @valderrama
Commits on Sep 4, 2011
  1. @valderrama
  2. @valderrama
  3. @valderrama
Commits on Aug 26, 2011
  1. @valderrama

    Merge branch 'master' into dev

    Conflicts:
    	README
    valderrama committed Aug 26, 2011
  2. @valderrama

    Modified README in dev

    valderrama committed Aug 26, 2011