Permalink
Commits on Nov 22, 2011
  1. Merge remote-tracking branch 'upstream/master'

    Michael Macasek committed Nov 22, 2011
  2. Revert "Merge branch 'fixed_require' of file:///Users/plamoni/Dropbox…

    …/github/otherSiriProxy/jpipas/SiriProxy"
    
    This reverts commit b6b4373, reversing
    changes made to 520f7b1.
    
    Sorry… I pulled in a branch that didn't really need to be pulled in. My bad.
    plamoni committed Nov 22, 2011
  3. Merge branch 'fixed_require' of file:///Users/plamoni/Dropbox/github/…

    …otherSiriProxy/jpipas/SiriProxy
    plamoni committed Nov 22, 2011
  4. Merge remote-tracking branch 'plamoni/master' into fixed_require

    Conflicts:
    	start.rb
    plamoni committed Nov 22, 2011
  5. Merge pull request #23 from courtenay/cannot_start_server

    Shows a nicer message when attempting to start the server without sudo or...
    plamoni committed Nov 22, 2011
  6. Shows a nicer message when attempting to start the server without sud…

    …o or when something else is running on 443.
    courtenay committed Nov 22, 2011
  7. changed send_payment to accept amount and recipient

    Michael Macasek committed Nov 22, 2011
  8. removed debug statements

    Michael Macasek committed Nov 22, 2011
  9. merge

    Michael Macasek committed Nov 22, 2011
  10. added bundler. added stub sandbox transfer

    Michael Macasek committed Nov 22, 2011
  11. fixed required issue #12

    jpipas committed Nov 22, 2011
  12. Fixed case of requires

    netpro2k committed Nov 22, 2011
  13. A couple cleanup items

    -Added a note to ReadMe about open-uri not necessarily being needed.
    -Removed #! from every file except start.rb -- because what's the point?
    -Added IRC channel to ReadMe
    plamoni committed Nov 22, 2011
Commits on Nov 21, 2011
  1. Readme modifications

    -Clarified the Siri on other devices FAQ
    -Added a note about jailbreaking
    -Added a couple more examples of plugins.
    plamoni committed Nov 21, 2011
  2. added better regex. neet to lookup names in address book

    Michael Macasek committed Nov 21, 2011
  3. added beginings of plugin for sending money via siri (based on the tw…

    …itter plugin)
    Michael Macasek committed Nov 21, 2011
  4. updated the twitter plugin to pull tokens form a yml file

    Michael Macasek committed Nov 21, 2011
  5. Merge pull request #7 from netpro2k/master

    Twitter Module
    plamoni committed Nov 21, 2011
  6. Merge pull request #5 from lacky/4a0fd9516464dda78426fc3e9a7061da0341…

    …8679
    
    Filenames not capitalized
    plamoni committed Nov 21, 2011
  7. Missed another capital

    lackstein committed Nov 21, 2011
  8. Missed another capital

    lackstein committed Nov 21, 2011
  9. Missed one capital

    lackstein committed Nov 21, 2011