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

285 commits

Author SHA1 Message Date
zhitomirskiyi
e9e01e965e fixed error with comments saving twice on the same pod 2011-01-24 17:24:29 -08:00
Raphael
e6e2ba9cfb Take out default scopes 2011-01-18 16:46:52 -08:00
zhitomirskiyi
004094d66f fixed the querying in the controllers got rid of hashes 2011-01-18 16:21:14 -08:00
zhitomirskiyi
c28b5a22fb here you go 2011-01-17 18:03:15 -08:00
Raphael
738e8c65c8 Merge almost complete, 4 failures 2011-01-14 16:00:10 -08:00
maxwell
23de681cb8 DG MS moved receive methods to their respective models 2011-01-11 14:23:18 -08:00
maxwell
daab8e80ce basic receive cleanup 2011-01-11 14:23:18 -08:00
maxwell
8819d288c4 i am greeen 2011-01-05 17:43:25 -08:00
zhitomirskiyi
11153cf2ca a couple more passing specs 2010-12-27 22:23:41 -08:00
Michael Sofaer and Raphael Sofaer
44093c9342 Status message spec now passes 2010-12-23 12:56:49 -08:00
Raphael
924bcca0e2 Isolated problem in status message marshalling, mysql 2010-12-22 21:34:45 -08:00
Raphael
baf0533466 logical failures on person spec, 25 failing model specs 2010-12-21 18:59:28 -08:00
Raphael
cbda6b8c58 58 failures with mysql 2010-12-21 17:14:52 -08:00
Raphael
319452537e Below 70 failures, GUIDs are next 2010-12-21 15:46:15 -08:00
Raphael
f043c9cc7e Took MongoMapper out of the bundle, trying to fix querying. 2010-12-20 16:53:56 -08:00
Raphael
4c47d8334c Add PostVisibility model, some more specs working 2010-12-20 13:23:05 -08:00
Raphael
d44e76a6aa Down to 250 failures in mysql 2010-12-20 00:36:48 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
3fe2924a60 WIP moving to mysql 2010-12-18 21:16:39 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
5c21e220ff post_spec now passes with mysql 2010-12-18 20:23:16 -08:00
Raphael
8798f05ff7 Revert "Revert redis merge to fix bugs on master" 
This reverts commit 30698d674b.
 2010-12-02 15:33:26 -08:00
Raphael
30698d674b Revert redis merge to fix bugs on master 2010-12-02 15:20:27 -08:00
Raphael
db0106f13c Rename EMWebfinger to Webfinger, clean up some related things 2010-12-02 12:35:25 -08:00
danielvincent
ce63e13eca aspect ids normalized to posts to minimize queries on views. 2010-11-26 18:55:06 -05:00
maxwell
769c0e1055 DG MS trying to finish statusmessage refactor 2010-11-21 16:13:01 -08:00
maxwell
7fb751b00c making photo uploader work better 2010-11-21 16:11:55 -08:00
maxwell
19bbf8ce4d IZ MS; fixed post update. Posts which implement the mutable? method now can be updated via receive 2010-11-02 12:38:30 -07:00
Raphael
9d273c6d24 Now expecting a 500 on someone passing an id to create, should really be a 422 2010-11-01 12:31:00 -07:00
danielvincent
5a9bfa7405 DG IZ; post senders are now verified by diaspora handles 2010-10-29 16:49:59 -07:00
Raphael
512f40eac2 attr_accessible on Post 2010-10-28 15:50:19 -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
d61a227fc7 posts now serialize their created_at time 2010-10-14 16:49:08 -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
ilya
c2b84fd9c6 added a public key to post 2010-09-27 16:59:54 -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
Patrick Aljord
182c6228f3 show comments ordered by created_at, they are showing up at random order without that 2010-09-18 07:36:21 +08:00
Raphael
c520fb71a7 Moved socket out to separate process. Multiple thins should now be possible 2010-09-16 21:34:15 -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
a44d40168a Encryption removed from everything other than comments, most irrelevant specs removed 2010-09-10 16:04:09 -07:00
maxwell
804777f9ae MS; updated to released rails 2010-09-07 16:47:53 -07:00
Daniel Vincent Grippi
5e34506df6 added custom as_json methods to models 2010-08-29 23:46:19 -07:00
Daniel Grippi
de8450c7c5 line spacing adjustments. 2010-08-29 23:04:28 -07:00
Raphael
55c94c385c fixed photos going through the websocket. added a spec to SocketsController 2010-08-25 16:08:44 -07:00
Raphael
511f571ae5 Specs mostly pass again 2010-08-23 15:01:39 -07:00
maxwell
5d25861dc6 IZ MS person profile page now displays only posts a user can see 2010-08-19 10:46:47 -07:00
danielvincent
7e5ace7cbc minor cleanup in models 2010-08-16 22:44:22 -07:00
ilya
74c70d9410 Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	app/models/user.rb
	spec/lib/diaspora_parser_spec.rb
 2010-08-16 18:18:30 -07:00
ilya
b5594ad6bc DG IZ; post user refs started (permissions) 2010-08-16 18:11:23 -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
d8959326d5 RS, DG; unsocketing is back in 2010-08-11 16:24:05 -07:00
Raphael
2d14f64745 RS, DG; Socketing moved to user 2010-08-11 16:10:27 -07:00
Raphael
599d1da620 Moved socket code out to lib, unsocketing from view should now work again 2010-08-11 12:03:26 -07:00
Raphael
c14bb5a4f8 Changed info logging to debug logging almost everywhere 2010-08-09 14:39:37 -07:00
Raphael
33a827c33a RS, DG; Websocket is now working again, users have a channel 2010-08-09 13:02:08 -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
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
Raphael
f487e271c0 RS, IZ; Posts now sign, signatures and keys now serialize 2010-08-05 10:43:02 -07:00
Raphael
9fe37b1d8c RS, IZ; Cleaned up user spec, started to add current_user.post 2010-08-02 16:16:23 -07:00
maxwell
7a0db375ab MS added rails 3rc 2010-07-29 09:59:03 -07:00
maxwell
b797704a14 MS small pointless webhooks refactor 2010-07-24 16:11:32 -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
ilya
031234f763 Failing at syntax 2010-07-23 15:42:12 -07:00
ilya
bb251e73b3 Logging photo.inspect after save 2010-07-23 15:37:07 -07:00
Raphael
7d7c39e3dc callbacks not running on photo save 2010-07-17 14:09:21 -07:00
Raphael
2d5d3a2f2d commit more often 2010-07-15 13:29:21 -07:00
Raphael
f680c4b71e RS, IZ; Signature Verification now stubbed out outside of encryption specs, green 2010-07-14 11:01:21 -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
d4d1aa0fd5 RS IZ validations of signature are now called on craeeton of a post 2010-07-13 14:34:30 -07:00
ilya
964ee65b11 rs iz ; the signature of the signable_accessors are now in the xml 2010-07-13 12:21:11 -07:00
ilya
add9961ca4 Now signing only xml accessors other than person 2010-07-13 11:41:57 -07:00
ilya
7952385cdb added newlines to post 2010-07-13 11:24:57 -07:00
ilya
25940cf567 Removed stray puts 2010-07-13 11:12:49 -07:00
ilya
a219801c2d Now using detached signatures 2010-07-13 11:10:04 -07:00
ilya
6d431e9459 signing tests sort of almost done 2010-07-13 11:01:27 -07:00
ilya
b9146cbb41 RS IZ; now signatures work like in real life 2010-07-12 20:42:22 -07:00
ilya
406c00aeb6 RS IZ; using detached signatures and verification things 2010-07-12 18:31:20 -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
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
2f5ec3d7c4 added a bunch of public keys to test ring 2010-07-09 19:17:07 -04:00
ilya
8c45dd4702 testing signing 2010-07-09 18:15:17 -04:00
ilya
b802db9194 writing signing 2010-07-09 17:41:01 -04:00
maxwell
db1811eb61 DG MS; cleaned up views for person. Also, pluralized Dashboard and Socket 2010-07-08 14:14:03 -07:00
maxwell
58ed75a289 MS socket now works in the server, but I can't figure out how to mock this stuff 2010-07-07 22:20:15 -07:00
maxwell
a35892428c Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo 2010-07-07 20:09:27 -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
maxwell
5350b40e3c broken autotest for rafi 2010-07-07 15:27:22 -07:00
danielvincent
df3fe6c2a9 DG IZ RS; deletion now gets sent through the websocket 2010-07-02 15:16:28 -07:00
danielvincent
8e6ddb4b2e propagate_delete -> propagate_retraction 2010-07-02 14:40:25 -07:00
Raphael
f9856517db Post deletion now deletes comments 2010-07-02 14:34:58 -07:00
danielvincent
469599a4a9 DG RS IZ; added post deletion propagation 2010-07-02 13:08:53 -07:00
maxwell
fcdba64828 pushing to test comment passing 2010-06-30 13:54:09 -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
46ab63de36 added will pagination action. 2010-06-28 21:56:58 -07:00
maxwell
3dce5f1b34 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-28 16:15:48 -07:00
maxwell
f4a8671854 fixed the remote socket updating bug? we will see 2010-06-28 16:15:30 -07: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
3d76fa26ba RS IZ testing GUID 2010-06-28 14:28:01 -04:00
Maxwell Salzberg
2bbfcb0bb1 putting debug in for master so I can check deployed servers out 2010-06-26 14:16:19 -07:00
maxwell
ec01e2c016 Comments now working, but no AJAX, need to refresh to see them 2010-06-25 22:15:41 -07:00
maxwell
a89e0d4a7f We are sorry. 2010-06-25 18:46:27 -07:00
maxwell
2566b2d4e1 added person validations 2010-06-25 18:31:35 -07:00
ilya
c0167a445a RS, IZ; Ended spec pollution, fixed up blog spec 2010-06-25 18:04:09 -04:00
maxwell
64c1d99b8c MS found the stupid nil. from here, i have 33 failures. 2010-06-24 22:20:09 -07: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
ilya
4323bc5fe7 RS, IZ, specs working again for real 2010-06-24 20:47:03 -04:00
maxwell
5f3a6a7aa0 MS mongomapper works kinda 2010-06-24 17:22:49 -07:00
Raphael
f0db58f912 Moved authentication to applicationcontroller for now, refactored posting statusmessages 2010-06-24 17:10:45 -07:00
ilya
b4cc4e797f RS IZ my newest fix 2010-06-23 20:29:57 -04:00
ilya
8829714e2d RS, IZ, Cleaned up Post, finished Person refactor, FactoryGirl sequences are unpleasant 2010-06-23 20:17:44 -04:00
maxwell
9fa26f020e DG MS; clicking on a person's name redirects to that person's post stream 2010-06-23 14:32:51 -07: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
maxwell
cc89cd5cda reload object before send to websocket 2010-06-22 16:12:15 -07:00
maxwell
3064d208eb added firefox websocket stuffs, only loads if it is not safari or chrome 2010-06-22 14:31:16 -07:00
maxwell
0546bb2582 pulled in all of max's changes from yesterday to 187 2010-06-22 10:39:06 -07:00
maxwell
655dd64a54 websockets work 2010-06-21 14:12:05 -07:00
maxwell
2f6a11f018 fixed the stupid addressable bug, also started playing with 1.9.2...sorry for the spaced out commit 2010-06-19 14:42:23 -07:00
danielvincent
39118293eb DG MS; fixed minor webhook bug when generating xml collection. 2010-06-17 18:45:50 -07:00
danielvincent
ba6d136bc7 DG MS; added specs for common module 2010-06-17 15:22:02 -07:00
danielvincent
628af0372f DG MS; completed event-queue intergration. 2010-06-17 14:29:41 -07:00
danielvincent
4cecb522b6 DG MS; queue still working. half-way finished cleaning up code. 2010-06-17 10:36:54 -07:00
danielvincent
d91cec0881 queue works. needs cleanup. 2010-06-17 10:29:30 -07:00
Maxwell Salzberg
67535c1113 tried to git rid of error in em-http-request 2010-06-17 09:20:59 -07:00
danielvincent
43207aeb41 pending: resolving post action in queue 2010-06-16 23:12:23 -07:00
danielvincent
da9f33aa72 fixed post stream to ascend by time 2010-06-16 17:35:39 -07:00
maxwell
9e89b2e0a7 DG MS did some basic work on the dashboard controller and some super basic fallback partial view 2010-06-15 21:08:29 -07:00
maxwell
497b477e89 DG MS added a post model, going to put it more places than just status message now 2010-06-15 17:21:57 -07:00