maxwell
|
9c2ca15e93
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-29 12:09:32 -07:00 |
|
maxwell
|
c6fbcd28f7
|
stubbing out the hub publish method
|
2010-10-29 12:09:10 -07:00 |
|
Raphael
|
d753e31205
|
Merge remote branch 'ed0h/309-user-choose-language'
Add explicit language set to spec in users_controller_spec.rb
Conflicts:
app/models/user.rb
|
2010-10-29 12:06:14 -07:00 |
|
maxwell
|
23db4fe278
|
merge complete
|
2010-10-29 11:33:31 -07:00 |
|
maxwell
|
39f66cc5d9
|
tests are green
|
2010-10-29 11:19:07 -07:00 |
|
maxwell
|
7c32649df4
|
rebasing master
|
2010-10-29 11:18:20 -07:00 |
|
maxwell
|
6d139ab946
|
more tests pass
|
2010-10-29 11:17:39 -07:00 |
|
maxwell
|
1b48572674
|
MS tests are now green
|
2010-10-29 11:16:50 -07:00 |
|
zhitomirskiyi
|
534cc112bf
|
IZ MS rebase master
|
2010-10-29 11:15:13 -07:00 |
|
maxwell
|
acd977a115
|
adding pending spec to check for error within webfinger process
|
2010-10-29 11:14:55 -07:00 |
|
maxwell
|
68a44af856
|
making a few more cleanup and tests
|
2010-10-29 11:13:08 -07:00 |
|
maxwell
|
eddcb71fcb
|
EM websocket cleanly merged with master. webfingering is now async
|
2010-10-29 11:11:05 -07:00 |
|
maxwell
|
58f836ab46
|
adding pending spec to check for error within webfinger process
|
2010-10-29 11:06:31 -07:00 |
|
maxwell
|
9a2e3ef158
|
making a few more cleanup and tests
|
2010-10-29 11:05:17 -07:00 |
|
maxwell
|
8fe339b03b
|
EM websocket cleanly merged with master. webfingering is now async
|
2010-10-29 11:05:17 -07:00 |
|
danielvincent
|
a7df1bca68
|
photos do not require an album. uploading files on a user's photos#index page will post to all aspects.
|
2010-10-29 10:38:17 -07:00 |
|
Sarah Mei
|
14fedf5369
|
GAHHH STOP EMAILING ME (specs pass)
Also, added attr_protected to Photo#person and Photo#person_id.
|
2010-10-29 00:59:26 -07:00 |
|
Raphael
|
f1ae95fac9
|
443- patch trim on validation + spec
|
2010-10-28 20:03:49 -07:00 |
|
zhitomirskiyi
|
3fc5651e9d
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-28 17:03:14 -07:00 |
|
zhitomirskiyi
|
f5d54ff6f8
|
another silly malicious friend spec
|
2010-10-28 17:02:55 -07:00 |
|
Raphael
|
78acdb7368
|
Pushing broken photo controller spec for dan to fix
|
2010-10-28 16:19:18 -07:00 |
|
Raphael
|
b5bea7f14d
|
Add specs for photo mass assignment
|
2010-10-28 16:19:18 -07:00 |
|
Raphael
|
512f40eac2
|
attr_accessible on Post
|
2010-10-28 15:50:19 -07:00 |
|
Raphael
|
f7d2665950
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-28 14:29:40 -07:00 |
|
Raphael
|
4aaa921121
|
A couple specs for create overwriting users
|
2010-10-28 14:26:20 -07:00 |
|
zhitomirskiyi
|
55b38585d6
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-28 12:13:50 -07:00 |
|
zhitomirskiyi
|
f484eb957f
|
comments now don't imbed the person in the xml
|
2010-10-28 12:13:39 -07:00 |
|
livefromthemoon@gmail.com
|
b7a586b1a5
|
allow user to change his language in his settings
|
2010-10-28 17:29:17 +02:00 |
|
danielvincent
|
1d5b7a87f1
|
Merge branch 'master' into getting-started
|
2010-10-27 18:14:08 -07:00 |
|
danielvincent
|
05c5e770ee
|
removed real name from signup process.
|
2010-10-27 16:25:22 -07:00 |
|
Raphael
|
ae65b7fc9b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-27 11:13:41 -07:00 |
|
Raphael
|
6c94d40bd4
|
Factory.build saves users
|
2010-10-27 11:03:57 -07:00 |
|
zhitomirskiyi
|
a5099bb89f
|
IZ moved methods found in spec helper to helper methods file. now we can include them in the db scripts to keep friending behavior in sync
|
2010-10-27 10:32:09 -07:00 |
|
zhitomirskiyi
|
4a09eb2ece
|
IZ MS update pending aspects controller spec
|
2010-10-27 10:14:24 -07:00 |
|
zhitomirskiyi
|
63c740fce7
|
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
|
2010-10-27 09:53:50 -07:00 |
|
Sarah Mei
|
0c8de9460c
|
Fix for 1.9 (no spaces between method name and parens)
|
2010-10-27 03:21:17 -07:00 |
|
zhitomirskiyi
|
fa484e95e4
|
MS IZ refactored querying
|
2010-10-26 17:05:38 -07:00 |
|
danielvincent
|
6e015790a7
|
settings are more restful with account settings submitting to users#update, and profile settings submitting to person#update
|
2010-10-26 16:02:53 -07:00 |
|
zhitomirskiyi
|
1024b8a3a7
|
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
Conflicts:
app/controllers/aspects_controller.rb
|
2010-10-26 14:57:52 -07:00 |
|
zhitomirskiyi
|
8acdf21234
|
MS IZ got rid of the requests for me scope in the user
|
2010-10-26 14:49:37 -07:00 |
|
zhitomirskiyi
|
e776389d19
|
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
|
2010-10-26 11:19:50 -07:00 |
|
danielvincent
|
060d8f9c7b
|
DG MS; fixed some bugs with posting publicly.
|
2010-10-25 19:24:48 -07:00 |
|
zhitomirskiyi
|
917d1838de
|
MS IZ specs are green
|
2010-10-25 18:55:51 -07:00 |
|
danielvincent
|
287d633c44
|
user#post now handles posting to services.
|
2010-10-25 17:41:59 -07:00 |
|
danielvincent
|
b2e8ebd0bc
|
OmniauthService -> Service. Cleaned up views.
|
2010-10-25 17:41:59 -07:00 |
|
maxwell
|
be39df75fe
|
removed fb_status from the factories. whoops.
|
2010-10-25 17:41:58 -07:00 |
|
maxwell
|
fdd222003a
|
fixed failing specs due to omitted factories.
|
2010-10-25 17:41:58 -07:00 |
|
maxwell
|
154b6e0ee7
|
MS DG added specs for posting to twitter, and basic services controller tests
|
2010-10-25 17:41:58 -07:00 |
|
maxwell
|
b17ae0bf38
|
DG MS removed unused fb_status model and respective specs, fixtures.
|
2010-10-25 12:26:08 -07:00 |
|
ilya
|
ff3dad2bff
|
adding assertion to album_spec many association
|
2010-10-24 14:03:03 -07:00 |
|