maxwell
|
f2bdc98b47
|
Merge branch 'master' of github.com:diaspora/diaspora into import
|
2010-10-13 23:52:46 -07:00 |
|
maxwell
|
e1dd0cf6be
|
Fixed pending people_controller spec; cleaned up person.search(this is ruby :D ); fyi, calling should_receive stubs that method, hence this test confusion
|
2010-10-13 23:49:13 -07:00 |
|
maxwell
|
55227f3f72
|
DG MS; filter_post method, aspect_clean method
|
2010-10-13 13:10:08 -07:00 |
|
Sarah Mei
|
56c6688c81
|
Take out reloads so specs run on 1.9.2
|
2010-10-12 20:54:00 -07:00 |
|
Raphael
|
900a085124
|
Merging in bigbash's fixes
|
2010-10-12 15:09:32 -07:00 |
|
danielvincent
|
afad554f01
|
DG MS; added link to send invitation, consolidated locale file for devise invitable, upgraded devise to 1.1.3 in the gemfile
|
2010-10-11 13:42:05 -07:00 |
|
danielvincent
|
9bfb213465
|
Merge branch 'invites' of github.com:diaspora/diaspora into invites
|
2010-10-11 11:52:57 -07:00 |
|
ilya
|
ee4c7c1cb8
|
Gemfile.lock
|
2010-10-08 17:05:12 -07:00 |
|
danielvincent
|
edd8f0ba6d
|
links now have active state
|
2010-10-08 15:35:22 -07:00 |
|
maxwell
|
255901dfab
|
fixing copypasta
|
2010-10-08 15:00:04 -07:00 |
|
ilya
|
4ecda6ab8f
|
Merge branch 'master' of github.com:diaspora/diaspora into invites
Conflicts:
Gemfile
Gemfile.lock
|
2010-10-07 18:20:51 -07:00 |
|
danielvincent
|
2e73104d6f
|
DG MS; updated BSON gems, added devise-mongomapper gem fix, using unforked devise 1.1.2
|
2010-10-07 18:17:26 -07:00 |
|
ilya
|
3c61365fa1
|
initial invitable in user
|
2010-10-07 18:11:17 -07:00 |
|
danielvincent
|
68590ccc17
|
removed autotest
|
2010-10-07 15:26:02 -07:00 |
|
Raphael
|
9912769b5b
|
Merge remote branch 'guillei/s3_upload'
|
2010-10-07 14:17:43 -07:00 |
|
danielvincent
|
dc88110716
|
img tag in hcard
|
2010-10-05 20:22:13 -07:00 |
|
Raphael
|
37fb2bfd32
|
Don't require a facebook yml
|
2010-10-05 16:57:22 -07:00 |
|
danielvincent
|
aed9125e93
|
more querying through the current_user in controllers
|
2010-10-05 12:41:41 -07:00 |
|
ilya
|
08b9aa864a
|
Merge branch 'master' of github.com:diaspora/diaspora into fb
Conflicts:
app/views/layouts/application.html.haml
app/views/shared/_publisher.haml
app/views/shared/_sub_header.haml
app/views/users/edit.html.haml
config/deploy_config.yml
config/routes.rb
|
2010-09-27 15:39:50 -07:00 |
|
Guillermo
|
6e0082da9e
|
Files are uploaded to S3 if the ENV variables are set (Heroku-friendly)
|
2010-09-26 11:03:47 -05:00 |
|
Stephen Caudill
|
05c2da81e5
|
Add cucumber and run the generator
|
2010-09-26 11:35:50 -04:00 |
|
Stephen Caudill
|
af938fe74f
|
Remove unused/broken Selenium tests
|
2010-09-26 11:33:41 -04:00 |
|
Raphael
|
40120bb441
|
Moving to activemodel validations
|
2010-09-24 11:15:39 -07:00 |
|
Raphael
|
b9bff76054
|
Initial 1.9.2, specs fail (possibly validatable), need to pull in aredridel photo fixes
|
2010-09-24 09:49:42 -07:00 |
|
Raphael
|
70a22ae839
|
Merge branch 'master' into HEAD
Conflicts:
app/models/post.rb
app/models/user.rb
config/initializers/socket.rb
|
2010-09-24 09:15:10 -07:00 |
|
Raphael
|
972cb54828
|
Move locale files, fix syntax error in fr-informal
|
2010-09-23 14:52:06 -07:00 |
|
maxwell
|
63ed6a3a95
|
MS DG made async webfingering controller. need to call it from javascript to prevent seeds from blocking. remember to update your gems
|
2010-09-21 21:31:53 -07:00 |
|
danielvincent
|
9571ade89c
|
basic setup
|
2010-09-21 12:29:39 -07:00 |
|
Raphael
|
c520fb71a7
|
Moved socket out to separate process. Multiple thins should now be possible
|
2010-09-16 21:34:15 -07:00 |
|
Michael Fellinger
|
ba058a39a8
|
Replace require_relative with compatible version
|
2010-09-16 14:50:30 +09:00 |
|
Jamie Wilkinson
|
45c4bf5fa7
|
Checking in the bundler lockfile is proper behavior
|
2010-09-16 13:13:08 +08:00 |
|
Patrick Aljord
|
a38655bd33
|
ignore Gemfile.lock
|
2010-09-16 09:59:55 +08:00 |
|
Paul Rosania
|
cdc009d701
|
Updated Gemfile.lock - no more mongo_ext
|
2010-09-16 09:49:57 +08:00 |
|
ilya
|
2311c33626
|
MS IZ mocked all the webrequest tests
|
2010-09-14 11:13:58 -07:00 |
|
Raphael
|
59006e657f
|
Hcard done manually
|
2010-09-09 15:15:37 -07:00 |
|
Raphael
|
c6aff4a562
|
making the hcard work
|
2010-09-09 13:02:59 -07:00 |
|
Raphael
|
2d1a49abb5
|
Add refs to mongomapper and validatable
|
2010-09-08 10:00:17 -07:00 |
|
maxwell
|
c8dc31bb5b
|
MS adding gemfile lock back into this house
|
2010-09-07 18:06:18 -07:00 |
|