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

215 commits

Author SHA1 Message Date
Raphael
abf27bbfb2 Take unused models out of webhooks spec 2010-10-20 17:43:13 -07:00
Raphael
ff3666df5e Cut parser spec time by a couple seconds 2010-10-20 17:43:13 -07:00
Raphael
0758f9245f Clean up specs a little, fix unfriending 2010-10-20 10:28:08 -07:00
Raphael
fd8028db33 Revert "Revert "Merge remote branch 'upstream/master'"" 
This reverts commit 1481056af2.
 2010-10-20 09:51:55 -07:00
Alec Leamas
1481056af2 Revert "Merge remote branch 'upstream/master'" 
This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
 2010-10-20 14:59:55 +02:00
maxwell
e7f764ffeb attack vector where you take posts from valid (unknown) diaspora people is now fixed 2010-10-20 00:42:33 -07:00
Raphael
52f7350f78 Fix a couple more specs 2010-10-19 23:29:59 -07:00
Raphael
43dd95147e Starting to remove database-cleaner 2010-10-19 23:29:58 -07:00
Raphael
360891496e Check that time serializes correctly post-parse, not on string equality 2010-10-19 17:09:52 -07:00
maxwell
733fb3b68e dump typo in spec 2010-10-14 23:12:44 -07:00
maxwell
0f75072477 make import spec pending with diaspora handle bug 2010-10-14 23:03:23 -07:00
maxwell
11925ded2b moving branches 2010-10-14 19:15:32 -07:00
maxwell
d61a227fc7 posts now serialize their created_at time 2010-10-14 16:49:08 -07:00
maxwell
6ef1780008 removing pointless pending spec 2010-10-13 23:20:25 -07:00
maxwell
04f6cdaacf MS DG; basic view support; it works, but it is ugly 2010-10-13 18:42:24 -07:00
maxwell
a86d965079 DG MS; importer now takes params for username, password, and diaspora handle 2010-10-13 17:07:16 -07:00
maxwell
f04934cbae DG MS; ensure aspect post_ids are only for user 2010-10-13 16:54:18 -07:00
maxwell
b395208a51 DG MS; added more stuff to importer. 2010-10-13 16:42:27 -07:00
maxwell
2c40fa5ebf DG MS; spec for clean_aspects 2010-10-13 13:32:22 -07:00
maxwell
637a79a99d DG MS; spec for clean_aspects 2010-10-13 13:28:10 -07:00
maxwell
55227f3f72 DG MS; filter_post method, aspect_clean method 2010-10-13 13:10:08 -07:00
danielvincent
0315869a24 all specs should pass again after merge 2010-10-13 09:43:58 -07:00
danielvincent
59c3be41b3 Merge branch 'master' of github.com:diaspora/diaspora into import 2010-10-13 09:21:27 -07:00
danielvincent
7ea3fe5bf1 MS DG; verifys implemented, but need more tests 2010-10-12 18:53:12 -07:00
danielvincent
92e5622247 DG MS; adding verification methods to importer. 2010-10-12 17:41:09 -07:00
danielvincent
8915eca3d5 DG MS; testing that posts actually get serialized into an array. 2010-10-12 15:39:52 -07:00
danielvincent
8720dfa950 DG MS; made test slower. posts now export correctly. 2010-10-12 15:33:08 -07:00
danielvincent
2e8bba1a04 MS DG adding more to exporter and importer 2010-10-12 11:34:13 -07:00
danielvincent
948c5d9b02 DG MS; end of day. 2010-10-11 19:04:27 -07:00
ilya
03df0ff716 parser spec is green 2010-10-11 18:22:19 -07:00
danielvincent
b2f3074eb0 DG MS; scenario for importer spec 2010-10-11 17:00:42 -07: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
danielvincent
7a3d168123 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 14:17:22 -07:00
Raphael
d7bbb66d27 Run whitespace:cleanup 2010-10-07 10:47:37 -07:00
danielvincent
f3c34692d8 pubsub support 2010-10-05 13:39:56 -07:00
ilya
b6a912dd02 slowly getting specs to pass on with the new api 2010-09-30 15:17:53 -07:00
ilya
e9521d7144 tiny commit to switch branches 2010-09-29 12:15:54 -07:00
ilya
46bf0cfd99 roundtrip done, just need to clean and move to the new api 2010-09-28 15:11:01 -07:00
ilya
c7d29b29c8 the salmon now encrypts the activity, and stores the aes key in the header 2010-09-28 13:22:19 -07:00
ilya
6eede48f9f started to refactor the salmon spec, changed data in to be parsed data 
to be more clear
 2010-09-28 12:39:55 -07:00
danielvincent
eac6b8a63b builder is now a class initialized with a user. added director class. 2010-09-27 21:54:01 -07:00
danielvincent
58b688aa68 fixed builder spec 2010-09-27 21:28:21 -07:00
danielvincent
26a4dc76a6 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-27 18:34:55 -07:00
danielvincent
3b8ddf76a3 temp route for atom feed. also, public atom currently displays all posts. 2010-09-27 18:34:47 -07:00
Raphael
6100b318e4 More accurately describe a spec 2010-09-27 18:12:55 -07:00
danielvincent
df800dc87e ostatus builder 2010-09-27 17:58:44 -07:00
ilya
cf0df90dae moved the private key into user where it belongs, two failing cucumber tests 2010-09-26 22:08:42 -07:00
Stephen Caudill
8c6dff35c0 Remove unnecessary includes 2010-09-25 13:11:44 -04:00
Stephen Caudill
536cea5e44 Remove consecutive empty lines 2010-09-25 12:06:39 -04:00
Stephen Caudill
821643deb9 Use the new style of spec_helper require 2010-09-25 11:27:59 -04:00
Raphael
19199dabfe fix spec_helper for 1.9.2 2010-09-24 11:49:30 -07:00
Raphael
50414fef40 Remove unused method from message handler 2010-09-21 11:03:21 -07:00
Raphael
60e29f6572 Magent should use the same settings as mongomapper, app config should load first, websocket spec is a little better. 2010-09-19 16:37:34 -07:00
Raphael
71ac61c01d Fix websocket specs 2010-09-17 12:49:05 -07:00
Raphael
99ad001d28 Fix websocket spec, take out puts in by_webfinger 2010-09-17 09:52:31 -07:00
Raphael
7c02200a67 Finish moving out websocket server, add task to start it 2010-09-16 21:42:16 -07: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
maxwell
c57f6b2d9a fixing merge 2010-09-15 13:29:39 -07:00
maxwell
84c60e5f2e DG MS fixing webfinger, i hope to goodness 2010-09-15 13:28:06 -07:00
Daniel Vincent Grippi
a925c14310 fixing webfinger/salmon 2010-09-15 12:35:23 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
ilya
2311c33626 MS IZ mocked all the webrequest tests 2010-09-14 11:13:58 -07:00
Daniel Vincent Grippi
84b29770fe Put raise back in webfinger fail 2010-09-13 16:05:43 -07:00
Daniel Vincent Grippi
40ecf176e8 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 14:26:15 -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
b05d106aed Remove user_refs from Person, put pendings in the broken photo specs 2010-09-13 12:16:43 -07:00
Raphael
44a1f82da9 Rename group to aspect 2010-09-13 10:38:38 -07:00
Raphael
4922ebd84c Finish removing encryption from retractions 2010-09-10 16:14:37 -07:00
Raphael
aa1f3c6438 Comments now use salmon, the whole salmon is encrypted, user querying moved to lib file 2010-09-10 10:31:23 -07:00
Raphael
86d9a41d25 send_friend_request_to now takes a person and group, rather than a receive url and a group id 2010-09-09 16:06:42 -07:00
Raphael
fd61535e11 Hcards working 2010-09-09 15:43:16 -07:00
Raphael
67f9d9dab5 Add hcard, add id for pod_location 2010-09-09 15:34:20 -07:00
Raphael
59006e657f Hcard done manually 2010-09-09 15:15:37 -07:00
Raphael
240dda4eab Salmon for posts is in, old cruft has not been taken out and requests and comments are unfinished 2010-09-09 12:21:36 -07:00
Raphael
4fd0853e71 Moving to salmon 2010-09-08 18:29:39 -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
2dd2f38442 Attempting to make comments from unknown users save 2010-08-26 19:15:22 -07:00
Raphael
72c41a5ff8 User post now requires a :to field 2010-08-24 15:42:24 -07:00
maxwell
a37b5ae09b IZ MS; added a basic salmon library to help with directed messages, and made an keyhash method 2010-08-23 18:45:20 -07:00
ilya
21f70c643d DG IZ; moved update_profile from Person into User. removed notify_people methods. temporarily broke album pushing 2010-08-18 16:15:10 -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
Raphael
eae4053902 Encryption removed from callbacks, except retractions sort of. verification is in user.receive 2010-08-16 17:23:54 -07:00
ilya
b3d8f59c77 removed many posts association within group model 2010-08-16 15:51:31 -07:00
danielvincent
f1f827120b intentional failing test in user for tomorrow. 2010-08-15 21:03:19 -07:00
ilya
7bd1193c5e RS, IZ; wrote and tested user retractions actually removing people from the friend lists on retractions 2010-08-13 11:19:20 -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
ilya
dd3fb1677b MS IZ continuiung to squash failing tests 2010-08-11 17:44:43 -07:00
Raphael
0907d7a9fd RS, DG; Cleaned up the switch in user.receive 2010-08-11 16:01:16 -07:00
Raphael
c6a620c7dd RS, DG; store_from_xml is gone, use user.receive 2010-08-11 15:05:05 -07:00
Raphael
5228e51262 RS, DG; store_from_xml now takes one objects. All talk of arrays and collections has been eliminated. 2010-08-11 14:40:48 -07:00
Raphael
11758beaf3 RS, DG; Removed <posts> from xml 2010-08-11 14:26:39 -07:00
Raphael
5abd604dad RS, DG; build_xml_for has been eliminated. 2010-08-11 14:21:53 -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
a45d852f30 MS IZ request specs now PASS 2010-08-10 17:36:25 -07:00
maxwell
95c4de5d6c MS IZ fixed all of the request specs zomg 2010-08-10 11:26:32 -07:00
maxwell
38abd51666 MS IZ fixed a couple of failing specs in the parser 2010-08-09 21:09:51 -07:00