Permalink
Switch branches/tags
Nothing to show
Commits on Aug 26, 2011
  1. css fix

    Clara Choi committed Aug 26, 2011
  2. CLARA FILL IT IN

    edward committed Aug 26, 2011
  3. Merge branch 'master' of github.com:edward/shop_appointments

    edward committed Aug 26, 2011
    * 'master' of github.com:edward/shop_appointments:
      css twitch
      typo
  4. Fixed webhooks?

    edward committed Aug 26, 2011
  5. css twitch

    Clara Choi committed Aug 26, 2011
  6. Fix webhook

    edward committed Aug 26, 2011
  7. typo

    Clara Choi committed Aug 26, 2011
  8. Merge branch 'master' of github.com:edward/shop_appointments

    edward committed Aug 26, 2011
    * 'master' of github.com:edward/shop_appointments:
      add shop to session
      Merge branch 'master' of github.com:edward/shop_appointments
  9. Fix routes for webhooks

    edward committed Aug 26, 2011
  10. Merge branch 'master' of github.com:edward/shop_appointments

    Clara Choi committed Aug 26, 2011
    Conflicts:
    	app/controllers/webhook_controller.rb
    	config/routes.rb
  11. add shop to session

    Clara Choi committed Aug 26, 2011
  12. Add gcal_id to appointments

    edward committed Aug 26, 2011
  13. Merge branch 'master' of github.com:edward/shop_appointments

    edward committed Aug 26, 2011
    * 'master' of github.com:edward/shop_appointments:
      stylesheet change
  14. More webhook stuff

    edward committed Aug 26, 2011
  15. stylesheet change

    Clara Choi committed Aug 26, 2011
  16. more webhook testing

    edward committed Aug 26, 2011
  17. wtf webhook testing

    edward committed Aug 26, 2011
  18. Typo

    edward committed Aug 26, 2011
  19. Added missing webhook route

    edward committed Aug 26, 2011
  20. WIP for webhooks

    edward committed Aug 26, 2011
  21. Added hopeful webhook test

    edward committed Aug 26, 2011
  22. Merge branch 'master' of github.com:edward/shop_appointments

    edward committed Aug 26, 2011
    * 'master' of github.com:edward/shop_appointments:
      commits
    
    Conflicts:
    	app/views/appointments/new.html.erb
  23. commits

    Clara Choi committed Aug 26, 2011
  24. Merge branch 'master' of github.com:edward/shop_appointments

    edward committed Aug 26, 2011
    * 'master' of github.com:edward/shop_appointments:
      adds notification and product calendar
  25. adds notification and product calendar

    Clara Choi committed Aug 26, 2011
  26. stores calendar locally

    Clara Choi committed Aug 26, 2011