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 |
|
Raphael Sofaer
|
7fd9b81e55
|
Fix spec in authorizations_controller, get rid of pp
|
2011-06-28 14:37:55 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
d46f3a8d1f
|
fixed every spec but the activity stream photos controller spec
|
2011-06-23 15:22:36 -07:00 |
|
Raphael Sofaer
|
04b0705733
|
Faraday follows redirects
|
2011-06-22 12:53:18 -07:00 |
|
Ilya Zhitomirskiy
|
b575983c22
|
WIP certs
|
2011-06-08 18:46:38 -07:00 |
|
Raphael
|
b67aca0ffc
|
Put in a lot of non nullable fields, edit the specs to match, drop a couple superfluous columns
|
2011-01-26 18:29:23 -08:00 |
|
Raphael
|
1353929d44
|
Made specs work with fixtures, spec_helper needs work
|
2011-01-18 13:31:10 -08:00 |
|
Raphael
|
738e8c65c8
|
Merge almost complete, 4 failures
|
2011-01-14 16:00:10 -08:00 |
|
maxwell
|
daab8e80ce
|
basic receive cleanup
|
2011-01-11 14:23:18 -08:00 |
|