Raphael
|
72559cbce1
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-17 10:37:18 -07:00 |
|
Raphael
|
50919ef491
|
Requesting now searches the local server by email for a matching person.
|
2010-08-17 10:37:09 -07:00 |
|
ilya
|
5761d5db36
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-17 10:35:37 -07:00 |
|
ilya
|
dea6551374
|
DG IZ; moved post() into User from Person.
|
2010-08-17 10:35:25 -07:00 |
|
Raphael
|
2c1c5df281
|
Moved search specs, renamed method
|
2010-08-17 10:24:59 -07:00 |
|
Raphael
|
eae4053902
|
Encryption removed from callbacks, except retractions sort of. verification is in user.receive
|
2010-08-16 17:23:54 -07:00 |
|
Raphael
|
ad07521e07
|
Made a few more tests pass
|
2010-08-16 16:22:46 -07:00 |
|
Raphael
|
3a591b0713
|
Merging in friend-refactor...
|
2010-08-16 15:35:14 -07:00 |
|
Raphael
|
b0537e2f34
|
Comments pushing in the right directions
|
2010-08-16 15:04:09 -07:00 |
|
Raphael
|
e4af2ccb1f
|
Rename send_comment to dispatch_comment, simplify it
|
2010-08-16 14:22:14 -07:00 |
|
Raphael
|
1f40ea23b6
|
logging is awesome
|
2010-08-16 13:58:05 -07:00 |
|
Raphael
|
f8e2e6bf2d
|
Infinite loops are the best
|
2010-08-16 13:49:48 -07:00 |
|
Raphael
|
598c646b07
|
Hack to get comments working for now
|
2010-08-16 12:56:02 -07:00 |
|
Raphael
|
4c731bf818
|
special-casing local webfinger
|
2010-08-16 11:29:14 -07:00 |
|
ilya
|
ac40f7974e
|
RS, IZ; A variety of fixes and some refactoring on unfriending and activate friend
|
2010-08-13 18:37:09 -07:00 |
|
ilya
|
5e33de7e56
|
unfriended method in the user
|
2010-08-13 09:47:08 -07:00 |
|
Raphael
|
cf5476f601
|
RS, DG; stop crashing trying to socket albums
|
2010-08-11 16:40:08 -07:00 |
|
Raphael
|
d8959326d5
|
RS, DG; unsocketing is back in
|
2010-08-11 16:24:05 -07:00 |
|
Raphael
|
4b5071ec05
|
DG, RS; socketing back in for your own posts
|
2010-08-11 16:12:55 -07:00 |
|
Raphael
|
9c9ebbf4c7
|
build_xml_for is no longer static, we should probably change the name
|
2010-08-11 13:58:18 -07:00 |
|
maxwell
|
89c54d1a63
|
MS IZ receive url in the request and a slash in person
|
2010-08-10 15:56:34 -07:00 |
|
maxwell
|
432ce02a14
|
MS IZ receive url is better
|
2010-08-10 15:35:40 -07:00 |
|
maxwell
|
487de2d865
|
MS IZ receive, not recieve
|
2010-08-10 15:17:12 -07:00 |
|
maxwell
|
7ff25ef81a
|
MS IZ saved the person model
|
2010-08-10 15:10:11 -07:00 |
|
maxwell
|
71612ba33d
|
changing some webfinger resources
|
2010-08-10 12:36:00 -07:00 |
|
maxwell
|
38abd51666
|
MS IZ fixed a couple of failing specs in the parser
|
2010-08-09 21:09:51 -07:00 |
|
maxwell
|
d443be35f9
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
Conflicts:
app/controllers/publics_controller.rb
app/models/user.rb
|
2010-08-09 17:31:46 -07:00 |
|
maxwell
|
56d7c67bbb
|
Going toward pending requests
|
2010-08-09 17:21:41 -07:00 |
|
Raphael
|
73a6cd911b
|
DG, RS; User person delegation fixed
|
2010-08-09 10:46:02 -07:00 |
|
ilya
|
890f927492
|
removed references of mine? method in all views
|
2010-08-08 22:53:23 -07:00 |
|
Raphael
|
7076097ee4
|
RS, IZ; The tests are green.
|
2010-08-06 16:56:13 -07:00 |
|
maxwell
|
58de12df5e
|
DG MS; PeopleController#index now accepts query string for search (only looks at first_name and last_name)
|
2010-08-06 16:35:02 -07:00 |
|
Raphael
|
4350e17656
|
RS, IZ; removed lots of putses, fixed up request, parser, retractions
|
2010-08-06 16:01:39 -07:00 |
|
Raphael
|
0f596af5c4
|
Refactored message_queue getting, fixed retraction spec
|
2010-08-06 13:13:00 -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
|
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
|
2429a1a476
|
RS, IZ; keys should roxml
|
2010-08-05 11:13:38 -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 |
|
ilya
|
4a3f6b2986
|
need to serialize key to bson
|
2010-08-04 21:08:25 -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
|
c92a225556
|
DG MS; user-person relationship done. bunch of failing stuff.
|
2010-08-04 19:22:14 -07:00 |
|
Raphael
|
1e954eae4f
|
took out old puts, put in new one
|
2010-07-28 20:37:42 -07:00 |
|
maxwell
|
301343ae01
|
DG MS added basic album support
|
2010-07-20 21:28:24 -07:00 |
|
ilya
|
1bd2c16ef1
|
DG IZ started the collection spec
|
2010-07-20 14:01:56 -07:00 |
|
Raphael
|
d7e07dfda8
|
comment specs fixed, comments now signed by post poster
|
2010-07-15 14:41:39 -07:00 |
|
Raphael
|
64c81f0551
|
merge in master, only friend tom
|
2010-07-15 14:18:22 -07:00 |
|
Raphael
|
862787ea93
|
RS, DG; person destruction no longer deletes comments
|
2010-07-15 14:12:01 -07:00 |
|
Raphael
|
335f202e2b
|
RS, IZ; Profiles are now embedded
|
2010-07-14 11:22:44 -07:00 |
|
ilya
|
4a0bd5fc0c
|
RS IZ; removed validations on marshaling and removed key deletion on person destroyw
|
2010-07-13 17:36:18 -07:00 |
|
ilya
|
83ea15c97a
|
merging in master
|
2010-07-13 12:23:09 -07:00 |
|
ilya
|
406c00aeb6
|
RS IZ; using detached signatures and verification things
|
2010-07-12 18:31:20 -07:00 |
|
maxwell
|
5ba2e61ab8
|
MS DG moved xml accessor for profile
|
2010-07-12 11:37:46 -07:00 |
|
ilya
|
3dfb55ee85
|
IZ MS pulled in master: this is now the authoritative branch; waiting for dan to fix gpg so we can move on
|
2010-07-11 00:04:08 -04:00 |
|
ilya
|
72e7514535
|
MS fixed your key fingerprint bug. ROML sux. all things which are marshalled as a class need to be after the other fields, because those fields were ignored. also, ids were no long being marshalled correctlyw
|
2010-07-10 23:30:24 -04:00 |
|
maxwell
|
902a8cb349
|
MS factored out User.first EVERYWHERE. Use User.owner now instead (currently just calls User.first, but now it is easier to make a new change
|
2010-07-10 10:34:46 -07:00 |
|
ilya
|
1bed575b90
|
Added the Key Fingerprint validation to the person model(defaults to empty string)
|
2010-07-10 06:09:53 -04:00 |
|
ilya
|
7eba033c0d
|
Revert "RS IZ Friday night, key_fingerprint serialization weirdness"
This reverts commit c6e16835df9c5d46d0ec5e0f1860da1ef4c0986a.
|
2010-07-10 05:29:57 -04:00 |
|
ilya
|
8c75761ba1
|
RS IZ Friday night, key_fingerprint serialization weirdness
|
2010-07-10 02:25:48 -04:00 |
|
maxwell
|
f5fd0b011a
|
DG MS; upon friend deletion, all connected posts and comments are purged
|
2010-07-09 16:08:00 -07:00 |
|
maxwell
|
b052ddeb84
|
DG MS; database seed scripts now ensure all friends are set to true
|
2010-07-09 14:13:39 -07:00 |
|
maxwell
|
48adc9ebc1
|
DG MS; person object now properly stored with request object save
|
2010-07-09 14:07:35 -07:00 |
|
ilya
|
122bbf0cd2
|
Merging dashboards
|
2010-07-08 20:56:25 -04:00 |
|
ilya
|
9e8426ceb4
|
RS, IZ; Users now have keys, keyring now in db folder
|
2010-07-08 19:57:10 -04:00 |
|
maxwell
|
1fa2dfd6eb
|
DG MS cleaning up friend request
|
2010-07-08 12:05:06 -07:00 |
|
danielvincent
|
3d105e7c1e
|
DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket.
|
2010-07-07 16:53:52 -07:00 |
|
Raphael
|
340a57ea6d
|
RS; figured out recursive serialization with ROXML, posts and comments now serialize with their persons
|
2010-06-30 08:06:30 -07:00 |
|
maxwell
|
fcbe8e42a0
|
RS MS slightly less explosive end if you call real name on someone that doesn't have a profile
|
2010-06-29 20:54:53 -07:00 |
|
maxwell
|
448fcf8f89
|
MS RS fixed real name, now profiles are created with a new friend
|
2010-06-29 20:33:55 -07:00 |
|
maxwell
|
638b71ae28
|
Added a spec to person, cleaned up some putses
|
2010-06-29 17:45:13 -07:00 |
|
maxwell
|
77c0bb5c4e
|
urls are now unique, and a user can not add a friend with the exact same url
|
2010-06-29 16:04:15 -07:00 |
|
maxwell
|
19e03c7077
|
person now has a url, and they cant add themselves any longer.... you need to add a url to your old development user, and we need to set it in the field
|
2010-06-29 12:33:00 -07:00 |
|
ilya
|
b5b9c647d7
|
DG IZ Created the profile model & friend view now shows the information
|
2010-06-28 21:32:09 -04:00 |
|
ilya
|
2b42ef216c
|
DG IZ; added a profile; one-to-one relation with Person (non-singleton)
|
2010-06-28 18:20:56 -04:00 |
|
ilya
|
179af4fbfa
|
Merged mongomapper and master
|
2010-06-25 00:11:45 -04:00 |
|
maxwell
|
e558d4833f
|
DG MS fixing tests
|
2010-06-24 20:45:49 -07:00 |
|
maxwell
|
5f3a6a7aa0
|
MS mongomapper works kinda
|
2010-06-24 17:22:49 -07:00 |
|
ilya
|
8829714e2d
|
RS, IZ, Cleaned up Post, finished Person refactor, FactoryGirl sequences are unpleasant
|
2010-06-23 20:17:44 -04:00 |
|
Maxwell Salzberg
|
523cb6f15f
|
DG; Post belongs to a Person, and a Person has many Posts. Also, added Person for real this time
|
2010-06-22 23:27:31 -07:00 |
|