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

162 commits

Author SHA1 Message Date
danielgrippi
648a10e6d3 Merge branch 'master' into follow 
Conflicts:
	app/controllers/requests_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/aspects_helper.rb
	app/views/notifications/index.html.haml
	config/routes.rb
	public/javascripts/aspect-edit.js
	public/javascripts/contact-list.js
	spec/integration/receiving_spec.rb
	spec/models/user/connecting_spec.rb
	spec/models/user/posting_spec.rb
 2011-05-04 11:35:35 -07:00
Raphael Sofaer
efe79eb351 Fix stream on pages other than 1, rename raw_visible_posts to visible_posts 2011-04-13 14:35:20 -07:00
danielgrippi
106ae983d5 Merge branch 'master' into follow. all specs green. 
Conflicts:
	app/controllers/application_controller.rb
	app/controllers/people_controller.rb
	app/models/person.rb
	config/assets.yml
	db/schema.rb
	public/javascripts/aspect-edit.js
	spec/controllers/aspects_controller_spec.rb
	spec/models/user/querying_spec.rb
	spec/spec_helper.rb
 2011-04-11 17:48:37 -07:00
danielgrippi
847f4fd260 edited subscribers to include all contacts on public posts. added the ability to drop an aspect regardless of contacts contained. wip. 2011-04-05 18:53:10 -07:00
Raphael Sofaer
fdb6675f28 Make things more postgres compatible 2011-04-05 09:49:39 -07:00
MrZYX
4b7c9315c8 log error when receiving a post instead of letting the job fail with weired error later in the chain 2011-04-02 17:44:48 +02:00
danielgrippi
97d8b34599 Fix all specs, add foreign key constraints on post_visibility 2011-03-29 17:31:56 -07:00
danielgrippi
8816bd7f91 8 failures left. wip. 2011-03-29 17:31:56 -07:00
danielgrippi
9a0d6219b5 Moving PostVisibility to aspects, WIP, model specs pass 2011-03-29 17:31:56 -07:00
MrZYX
c2a4c2157d oh yeah it's delete_all on has_many, seems like I shouldn't code today… 2011-03-28 18:04:21 +02:00
MrZYX
824c4b38ad dependent delete for likes 2011-03-28 17:54:07 +02:00
MrZYX
11b0a2c19d dependent destroy for likes 2011-03-26 21:47:40 +01:00
Raphael Sofaer
b9af450628 Relayable retractions pretty much done 2011-03-25 16:09:37 -07:00
danielgrippi
c0ce0d71b8 Make pending specs green, I think there are still some to_jsons where there should be as_json 2011-03-25 15:06:22 -07:00
MrZYX
1b1a23aa8f likes/dislikes WIP TODO: better icons, better styling, integration on photo show page 2011-03-20 18:10:58 +01:00
danielgrippi
1f5edb1d92 Merge branch 'private_messages' 
Conflicts:
	app/controllers/status_messages_controller.rb
	app/models/data_point.rb
	app/models/status_message.rb
	db/schema.rb
	lib/fake.rb
	public/stylesheets/sass/application.sass
	spec/models/mention_spec.rb
 2011-03-08 21:23:41 -08:00
zhitomirskiyi
80a3a3446a pulling in 2011-03-06 21:37:27 -08:00
danielvincent
21fd546cd0 posts now have authors instead of people 2011-03-01 18:05:05 -08:00
danielvincent
11309574cf messages are now relayable, a comment has an author as opposed to a person. 2011-03-01 12:39:42 -08:00
danielvincent
f4e6d0d82b broke out some comment logic to a replayable module 2011-03-01 12:28:33 -08:00
Raphael Sofaer
d8956a7cd5 Add foreign key constraints 2011-02-28 15:18:35 -08:00
zhitomirskiyi
97e00f9ee3 changed the delete to a destroy on retraction, also removed a puts 2011-02-23 12:00:42 -08:00
Raphael Sofaer
ff0f37ceea eliminate one source of dup pvs 2011-02-11 18:25:57 -08:00
zhitomirskiyi
0e9fdeeab0 destroy 2011-02-10 19:55:30 -08:00
zhitomirskiyi
4033c19323 destroy_all so that the callbacks are called 2011-02-10 19:50:21 -08:00
Raphael Sofaer
7b3a2b07ee Removed n-query, created mentions table 2011-02-09 16:07:25 -08:00
maxwell
a649d18cd7 add tests to see if timestamps are updated on recevie...they are not 2011-02-08 14:07:25 -08:00
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