e8e58757d4cdd890717d82c16ecf0a9877781a35 947592174633a687a30167ce1e32811cc7379a88 Eduard Bondarenko edbond@gmail.com http://github.com/yariv/twoorl/commit/1fa9b885b6b8e5dcbb8919aeb26a2b1ba23bf654 1fa9b885b6b8e5dcbb8919aeb26a2b1ba23bf654 2008-07-21T04:21:28-07:00 2008-07-21T04:21:28-07:00 Merge branch 'master' of git@github.com:edbond/twoorl Conflicts: .gitignore Emakefile elib/twitter_client/twitter_client.erl elib/twitter_client/twitter_client.hrl src/components/api_controller.erl src/components/login_controller.erl src/components/register_controller.erl src/components/reply.erl src/components/settings_controller.erl src/components/stats_controller.erl src/components/stats_view.et src/twoorl.erl src/twoorl_stats.erl src/twoorl_sup.erl src/twoorl_twitter.erl d67f5ff29ec2f57740a38d84d9c466dcb130da54 Eduard Bondarenko edbond@gmail.com fe7f92ea1eff9de6f22a50880fdbac1cb7768521 Yariv Sadan yarivvv@gmail.com http://github.com/yariv/twoorl/commit/ede429e2dab0ac2c552349d5220fbc8f08510b52 ede429e2dab0ac2c552349d5220fbc8f08510b52 2008-06-17T20:58:12-07:00 2008-06-17T20:58:12-07:00 Merge branch 'my-ngerakines' Conflicts: .gitignore src/components/login_controller.erl src/components/settings_controller.erl src/twitter.erl a3d71b1a0331e5abb62bdc2298c0f94ce5c7b0b8 Yariv Sadan yarivvv@gmail.com ac818dac5694098cc31d3b51cc7952ec9b8423b8 Nick Gerakines nick@gerakines.net http://github.com/yariv/twoorl/commit/b628ac650151afe75b04f8fc8e78d2995d3c6ff6 b628ac650151afe75b04f8fc8e78d2995d3c6ff6 2008-06-09T00:02:06-07:00 2008-06-09T00:02:06-07:00 Organized the elib. Updated the Makefile, Readme and Emakefile. Added the twitter_client library to the elib stack. Refactored Twitter client and Twoorl API code. f1a2cc8f8eb2d3fac435e1b5f656e210d0f800a2 Nick Gerakines nick@gerakines.net b142ab6934766bc059b8d9102294e3a1db52c7f8 a835bf5405a10aefdafd176fdff72b12f5011822 Nick Gerakines nick@gerakines.net http://github.com/yariv/twoorl/commit/1b6efb89a5c289559b955706542d0461af6f0ad6 1b6efb89a5c289559b955706542d0461af6f0ad6 2008-06-08T19:58:12-07:00 2008-06-08T19:58:12-07:00 Working now json feeds for users df73d89dc6ecf8f9fae67eb3fb59a78184087578 Nick Gerakines nick@gerakines.net