nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3349 commits 4 branches 0 tags 121 MiB
Commit graph

44 commits

Author SHA1 Message Date
zhitomirskiyi
8acdf21234 MS IZ got rid of the requests for me scope in the user 2010-10-26 14:49:37 -07:00
ilya
4a7c4e0848 requests are made on invite but perhaps they should be made on signup so that we have a person 2010-10-14 18:12:18 -07:00
Shawn McGuire
711dcdc5f4 Issue #280 Fixed trailing whitespace error 2010-10-13 14:36:03 -05:00
maxwell
0541833c18 stop the file include madness. using File.join and Rails.root for includes everywhere I could 2010-10-10 11:54:08 -07:00
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
Stephen Caudill
536cea5e44 Remove consecutive empty lines 2010-09-25 12:06:39 -04: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
TJ Peden
e6c8cf20d3 Fixed receive_url problem 2010-09-21 01:26:51 +08:00
maxwell
e668071ea5 README.md 2010-09-16 18:48:18 -07:00
maxwell
2e8785b596 applying this change from wiki, thanks astronouth7303 2010-09-16 15:04:29 -07:00
Michael Fellinger
35c9922c61 And fix some more requires 2010-09-16 15:24:26 +09:00
Jamie Wilkinson
fbdd50172d Cleanup stray whitespace 2010-09-16 10:07:59 +08:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
4c15b1a01c added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
Raphael
44a1f82da9 Rename group to aspect 2010-09-13 10:38:38 -07:00
Raphael
a44d40168a Encryption removed from everything other than comments, most irrelevant specs removed 2010-09-10 16:04:09 -07:00
Daniel Grippi
de8450c7c5 line spacing adjustments. 2010-08-29 23:04:28 -07:00
Raphael
c629c23232 Tests now pass, export_key changed to exported_key, profile.person changed to _parent_document 2010-08-27 10:05:14 -07:00
Raphael
4a4686ce6e refactored signature validation got specs passing 2010-08-17 23:21:00 -07:00
danielvincent
7e5ace7cbc minor cleanup in models 2010-08-16 22:44:22 -07:00
ilya
1fcb033b68 RS, IZ; receiving a request no longer overwrites the group it is destined for, specs pass 2010-08-13 10:55:18 -07:00
danielvincent
3d12e9ab51 DG RS; friending through groups 2010-08-12 21:30:16 -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
da4de20ce1 IZ MS made things push to the receive url 2010-08-10 15:24:51 -07:00
maxwell
56d7c67bbb Going toward pending requests 2010-08-09 17:21:41 -07:00
maxwell
8532be1307 MS IZ moved activate_friend to user 2010-08-09 11:03:16 -07:00
maxwell
544f7f08e5 MS IZ doesn't delete from pending friends since there is nothing in it 2010-08-09 10:38:13 -07:00
Raphael
4350e17656 RS, IZ; removed lots of putses, fixed up request, parser, retractions 2010-08-06 16:01:39 -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
f8e7d3f313 RS, IZ; Rolling back special casing of friend-request 2010-08-05 11:14:40 -07:00
Raphael
ebe14b5afd RS, IZ; Not using person in friend request verification 2010-08-05 11:09:36 -07:00
Raphael
6832c67a78 RS IZ friend requests are hopefully now signed 2010-08-04 17:20:34 -07:00
maxwell
9095a06738 MS just broke common.rb out into 3 files.... all tests pass, dont shoot me if something is broken, but on first pass we look ok 2010-07-24 01:56:07 -07:00
maxwell
9b1fcdbab2 MS DG some serious message handler and user request API stuff....needs way more tests 2010-07-21 20:33:43 -07:00
ilya
83ea15c97a merging in master 2010-07-13 12:23:09 -07:00
maxwell
f9f7f0fcc7 DG MS; request makes sure http:// and an ending slash is present on a new request link 2010-07-12 12:33:31 -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
c7e1bc3a46 DG MS debugging friend requests 2010-07-09 10:18:29 -07:00
maxwell
c2c64d9938 MS DG more friend request tests pass 2010-07-08 23:14:54 -07:00
maxwell
e1834cc887 DG MS fixed spec 2010-07-08 20:51:12 -07:00
maxwell
06eec9204a DG MS; person request is now request. refactoring as well. user verbiage for request actions 2010-07-08 18:28:39 -07:00