ilya
|
8e6dfe7166
|
DG IZ having an email key makes devise work, ring to deploy
|
2010-08-08 17:00:39 -07:00 |
|
danielvincent
|
a6f5603dc9
|
added email field to login screen. strange error won't let me log in?
|
2010-08-06 23:55:05 -07:00 |
|
Raphael
|
214685e5a9
|
Dev seed might now work
|
2010-08-06 17:11:50 -07:00 |
|
Raphael
|
7076097ee4
|
RS, IZ; The tests are green.
|
2010-08-06 16:56:13 -07:00 |
|
Raphael
|
4350e17656
|
RS, IZ; removed lots of putses, fixed up request, parser, retractions
|
2010-08-06 16:01:39 -07:00 |
|
Raphael
|
f2e327d908
|
User factory now works
|
2010-08-06 13:27:42 -07:00 |
|
Raphael
|
0f596af5c4
|
Refactored message_queue getting, fixed retraction spec
|
2010-08-06 13:13:00 -07:00 |
|
Raphael
|
d130b82e42
|
RS, IZ; ApplicationHelper specs now passed, specs for mine? moved into person spec as specs for owns?
|
2010-08-06 11:52:33 -07:00 |
|
Raphael
|
b5cbfab36e
|
RS, IZ; Comment spec now passes
|
2010-08-05 19:01:45 -07:00 |
|
maxwell
|
5d924dadf4
|
MS DG; 19 failing specs left
|
2010-08-05 17:16:51 -07:00 |
|
maxwell
|
dc0eb7de51
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-05 15:13:59 -07:00 |
|
maxwell
|
5e6d0c1153
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into
friend-refactor, also fixed more specs
Conflicts:
app/models/person.rb
app/models/user.rb
spec/factories.rb
|
2010-08-05 15:13:05 -07:00 |
|
Raphael
|
bffb63d9f0
|
IZ, RS; Moved every instance of hardcoded backer info out to yml file config/deploy_config.yml
|
2010-08-05 14:39:48 -07:00 |
|
danielvincent
|
dae8f26692
|
DG MS; fixed most photo specs
|
2010-08-05 11:56:37 -07:00 |
|
Raphael
|
bb66e87905
|
RS, IZ; Encryption specs now pass with openssl
|
2010-08-05 11:56:31 -07:00 |
|
Raphael
|
f8e7d3f313
|
RS, IZ; Rolling back special casing of friend-request
|
2010-08-05 11:14:40 -07:00 |
|
Raphael
|
2429a1a476
|
RS, IZ; keys should roxml
|
2010-08-05 11:13:38 -07:00 |
|
Raphael
|
ebe14b5afd
|
RS, IZ; Not using person in friend request verification
|
2010-08-05 11:09:36 -07:00 |
|
Raphael
|
f487e271c0
|
RS, IZ; Posts now sign, signatures and keys now serialize
|
2010-08-05 10:43:02 -07:00 |
|
danielvincent
|
4827953bec
|
DG MS; person specs are now passing. retraction on unfriend is now uncommented
|
2010-08-05 10:29:30 -07:00 |
|
danielvincent
|
42c0b82068
|
one failing test in Person. i have no idea.
|
2010-08-04 23:54:15 -07:00 |
|
danielvincent
|
d6bc93fb96
|
commented out retraction on unfriending due to ROXML messing things up
.
|
2010-08-04 23:47:27 -07:00 |
|
ilya
|
4a3f6b2986
|
need to serialize key to bson
|
2010-08-04 21:08:25 -07:00 |
|
ilya
|
f11e973602
|
added the inport key thing in user
|
2010-08-04 20:44:18 -07:00 |
|
ilya
|
5dfc097c88
|
replaced the functionality with openssl, didn't do the encryption spec
|
2010-08-04 20:32:15 -07:00 |
|
danielvincent
|
f2d7f35b84
|
unfriend still not removing association from bad_friend
|
2010-08-04 20:29:54 -07:00 |
|
danielvincent
|
7a556e1b3c
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-04 19:23:56 -07:00 |
|
danielvincent
|
c92a225556
|
DG MS; user-person relationship done. bunch of failing stuff.
|
2010-08-04 19:22:14 -07:00 |
|
Raphael
|
6832c67a78
|
RS IZ friend requests are hopefully now signed
|
2010-08-04 17:20:34 -07:00 |
|
Raphael
|
7676179e54
|
IZ, RS; now passing correct object to verify_signature
|
2010-08-04 17:10:38 -07:00 |
|
Raphael
|
5a802299d5
|
IZ, RS; Retractions should now be signed
|
2010-08-04 17:06:15 -07:00 |
|
Raphael
|
2388237174
|
RS, IZ; Replace type_name method with object.class.to_s
|
2010-08-04 16:36:08 -07:00 |
|
Raphael
|
b8a2e8ecdf
|
RS, IZ; Fix Photo.instantiate, make photo url include spec a little more specific
|
2010-08-04 16:13:32 -07:00 |
|
Raphael
|
e2c0ae2cee
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-04 16:01:37 -07:00 |
|
Raphael
|
c245d8c60c
|
Merging ostatus deletion with selenium start
|
2010-08-04 16:01:19 -07:00 |
|
danielvincent
|
75663b2447
|
DG MS; user can edit photo caption. also, photos have captions.
|
2010-08-04 16:00:59 -07:00 |
|
Raphael
|
58addca8dd
|
RS, IZ; extracted and murdered ostatus.
|
2010-08-04 16:00:01 -07:00 |
|
danielvincent
|
09958bc207
|
DG MS; removed delete friend button from current user's show page
|
2010-08-04 15:43:24 -07:00 |
|
danielvincent
|
278189462b
|
fixed ostatus generator references in models
|
2010-08-04 09:59:15 -07:00 |
|
danielvincent
|
c5ace3069d
|
diaspora module correctly loads everything (lazy)
|
2010-08-04 00:41:23 -07:00 |
|
Raphael
|
e3c28c4fee
|
Fixed Photos, and Carrierwave initializer
|
2010-08-02 21:31:14 -07:00 |
|
Raphael
|
da3bf35d81
|
Typo in album
|
2010-08-02 18:30:09 -07:00 |
|
Raphael
|
6b1f020839
|
Moved utilities out to special controller, took pound sign out of database name
|
2010-08-02 18:03:16 -07:00 |
|
Raphael
|
74691228d3
|
RS, IZ; All relevant controllers now create with user.post
|
2010-08-02 16:32:52 -07:00 |
|
Raphael
|
9fe37b1d8c
|
RS, IZ; Cleaned up user spec, started to add current_user.post
|
2010-08-02 16:16:23 -07:00 |
|
Raphael
|
d503c6541f
|
RS; posted statuses now use the websocket to update latest, time is now styled right
|
2010-08-02 11:13:21 -07:00 |
|
Raphael
|
b8ae6b44a2
|
RS; Image filename is now the Photo model id
|
2010-08-02 10:05:34 -07:00 |
|
Raphael
|
c95ceecf9e
|
Clarified socket helper, added a selenium test
|
2010-07-30 12:40:02 -07:00 |
|
Raphael
|
6fe00982f2
|
RS, IZ, fixing another error on person show
|
2010-07-30 10:32:36 -07:00 |
|
Raphael
|
0fd35709b1
|
RS, IZ, fixing error on person show with no posts
|
2010-07-30 10:26:00 -07:00 |
|