Permalink
Commits on Oct 14, 2012
  1. Merge remote-tracking branch 'origin/master' into setup-beginner-copy…

    …-pass
    
    Conflicts:
    	docs/dynamic_apps.rst
    	docs/hello_world.rst
    	docs/setup.rst
    	docs/voting.rst
    Charlie Hsu committed Oct 14, 2012
  2. Merge branch 'master' of github.com:twilio/workshop

    Kevin Burke committed Oct 14, 2012
  3. add getQueueStatistics

    Kevin Burke committed Oct 14, 2012
  4. txt changes in client docs

    Kevin Burke committed Oct 14, 2012
  5. explain client and add index.html

    Kevin Burke committed Oct 14, 2012
  6. Merge branch 'master' of github.com:twilio/workshop

    Kevin Burke committed Oct 14, 2012
  7. resolve merge conflict

    Kevin Burke committed Oct 14, 2012
  8. Add weather

    kyleconroy committed Oct 14, 2012
  9. add route for dequeueing callers

    Kevin Burke committed Oct 14, 2012
  10. Clarifying localhost

    Gipetto committed Oct 14, 2012
  11. Update voting content

    kyleconroy committed Oct 14, 2012
  12. Image size tweaks

    Gipetto committed Oct 14, 2012
  13. Hello World tweak

    Gipetto committed Oct 14, 2012
  14. Updated docs & style tweeks

    Gipetto committed Oct 14, 2012
  15. Fix spelling

    kyleconroy committed Oct 14, 2012
  16. Add debugger image

    kyleconroy committed Oct 14, 2012
Commits on Oct 13, 2012
  1. Add instructions for 2-step authentication

    Reorder deploy and edit
    kyleconroy committed Oct 13, 2012
  2. Merge pull request #20 from RobSpectre/master

    Added best practices content.
    kyleconroy committed Oct 13, 2012
  3. 1) Fixed a couple typos.

    2) Added best practices content.
    RobSpectre committed Oct 13, 2012
  4. Added section on application errors and directing users to the AppEng…

    …ine Launcher Logs button
    
    Maybe we should include a screen capture of where the Logs button is on the AppEngine launcher. I wanna make the red circles but I probably can't make it the same as what we have on the Initial Setup guide
    kelvl committed Oct 13, 2012