Permalink
Switch branches/tags
Nothing to show
Commits on Nov 5, 2011
  1. Fixed merge issues

    valderrama committed Nov 5, 2011
  2. Changed complex queries to use get by sql and fixed badgesto be assoc…

    valderrama committed Nov 5, 2011
    …iated with events not users
Commits on Oct 18, 2011
  1. Merge branch 'master' of https://github.com/plaza/Plaza

    alexanderatallah committed Oct 18, 2011
    Conflicts:
    	app/views/groups/show.html.erb
Commits on Oct 16, 2011
  1. removed instance variables

    valderrama committed Oct 16, 2011
Commits on Oct 8, 2011
  1. resolved conflicts

    valderrama committed Oct 8, 2011
  2. Basic events added. RERUN rake db:reset after pulling this commit bec…

    valderrama committed Oct 8, 2011
    …ause the seeding file has been updated with events and locations.
Commits on Oct 3, 2011
  1. Pulling master

    valderrama committed Oct 3, 2011
  2. pushing master

    valderrama committed Oct 3, 2011
Commits on Oct 2, 2011
  1. Google Analytics

    alexanderatallah committed Oct 2, 2011
Commits on Sep 7, 2011
  1. Finished with writing script to generate db/seeds.rb; to use execute …

    valderrama committed Sep 7, 2011
    …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
Commits on Sep 5, 2011
Commits on Sep 4, 2011
Commits on Aug 26, 2011
  1. Merge branch 'master' into dev

    valderrama committed Aug 26, 2011
    Conflicts:
    	README
  2. Modified README in dev

    valderrama committed Aug 26, 2011