Raphael Sofaer 1af945de11 Merge branch 'master' into oauth ... Conflicts: Gemfile Gemfile.lock app/models/app_config.rb app/models/post.rb db/schema.rb public/stylesheets/sass/application.sass spec/lib/webfinger_spec.rb		2011-06-28 17:13:38 -07:00
..
comment_steps.rb	Clean up stream.js, make the comments step selector more sane	2011-05-31 15:52:17 -05:00
custom_web_steps.rb	Merge branch 'master' into follow	2011-05-16 14:56:28 -07:00
debug_steps.rb	Add the Hashrocket default step definitions	2010-09-26 11:35:50 -04:00
factory_steps.rb	Add the Hashrocket default step definitions	2010-09-26 11:35:50 -04:00
oauth_steps.rb	added cucumber test for re-registering a pod from a client	2011-06-23 18:57:39 -07:00
posts_steps.rb	Allow anyone to generate a token, restrict tokens to ActivityStreams::PhotosController#create, don't let tokens create sessions.	2011-05-20 15:14:23 -07:00
scope_steps.rb	User creates an aspect	2010-09-26 12:05:39 -04:00
session_steps.rb	Logout: still not a word.	2011-04-29 19:44:57 -07:00
uri-step.rb	suburi cucumber test.	2010-12-29 10:31:25 +01:00
user_steps.rb	Merge branch 'master' into oauth	2011-06-28 17:13:38 -07:00
web_steps.rb	added a special case for share bc js being slow	2011-02-03 16:16:45 -08:00