github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.

Age	Commit message (Collapse)	Author
2011-11-09	fix final tag stream spec	Maxwell Salzberg

2011-11-08	fixed order dependent spec	Jonne Hass

2011-11-08	MS SM save sync cache if you have some sort of contacts	Maxwell Salzberg

2011-11-08	Remove resque_rescheduler as it was killing our app servers (receiving	danielgrippi
	http requests). Revert "retry less" This reverts commit 7784156e3b08ce18417b048855f924bbc5dcbe2b. Revert "supress resque retries" This reverts commit 80cdcd4eddafcf5cbbc4bed3a3576c364828b656. Revert "Retry federation if remote pod is down" This reverts commit bcbc86e50286adc47631523fbfcd4687b15497a7. Conflicts: app/models/jobs/http_multi.rb
2011-11-07	repopulating the redis cache should clear the entire set first	danielgrippi

2011-11-07	fix construct_shareable_from_others_query to only include posts from ↵	danielgrippi
	contacts within your aspects
2011-11-07	Specify a fixture path relative to Rails.root to appease the Travis.	Pistos

2011-11-07	Whitespace cleanup.	Pistos

2011-11-07	Delete all pending specs except stuff we actually want to fix in the short ↵	Sarah Mei
	term. Add more useful comments to those.
2011-11-07	Remove some empty files. If you're gonna scaffold, plz remove empty files ↵	Sarah Mei
	before committing kkthx.
2011-11-07	Merge branch 'master' of github.com:diaspora/diaspora	Sarah Mei

2011-11-07	get rid of all pending specs except the one that is actually pending	Sarah Mei

2011-11-07	Merge remote-tracking branch 'johnedmonds/issue1144'	Pistos

2011-11-07	Fix order-dependent test that would sometimes fail on postgres	Sarah Mei

2011-11-07	Rename and make pending the spec for populating the cache	Sarah Mei

2011-11-06	Improved reshare receive	Jonne Hass
	- Do not error out on Reshare#fetch_post/after_parse if we get a 404 - Do error out if another error happens in Reshare#fetch_post/after_parse - Retry failling receive jobs a few times
2011-11-06	Merge branch 'new_user_language' of https://github.com/alda519/diaspora	Jonne Hass

2011-11-06	test that photosController#index succeeds without any photos	Jonne Hass

2011-11-06	Merge branch 'master' of github.com:diaspora/diaspora	Sarah Mei

2011-11-06	Refactor regular expression used to find tags so that it supports unicode in ↵	Sarah Mei
	both ruby 1.8 and ruby 1.9. NEVER SPEAK OF THIS AGAIN.
2011-11-06	Revert "add participant_users to conversations"	danielgrippi
	This reverts commit 655558cb95181929b8d3aa8713e43bbf61682615. Revert "MS DG; for real this time?" This reverts commit f85a047f6f61b71eb8f40a594e4f26eeff41b297. Revert "MS DG; actually fix the bug" This reverts commit cde12ec2325308c631cd2b2f0a6549e5519bbdf0. Revert "fix small commenting email bug #oops" This reverts commit a552fc80c09449bf4e507dfd20918a5061f45b05. Revert "dont ban diasporahq stuff" This reverts commit 2c12b94e6752abe24c41cf09c93c3a6ec09c861a. Revert "Merge branch 'participants'" This reverts commit 741780188646ab4bc683ae9d35354451cbff13cb, reversing changes made to abd211ba72e7d7b88825c5a6fcf83b54aa9aa1a0.
2011-11-06	Run ostatus builder spec that sometimes causes nokogiri to segfault	Sarah Mei

2011-11-06	Refactor and backfill tags_following_controller_spec. Move normalize tag ↵	Sarah Mei
	specs into model spec. Move rss fixture file into fixture directory.
2011-11-05	Fix facebook spec	Sarah Mei

2011-11-05	Fix notify local users spec	Sarah Mei

2011-11-05	Fix user controller spec	Sarah Mei

2011-11-05	MS DG; for real this time?	Maxwell Salzberg

2011-11-05	fix small commenting email bug #oops	Maxwell Salzberg

2011-11-05	include post author in participats	Maxwell Salzberg

2011-11-05	MS DG add participants	Maxwell Salzberg

2011-11-05	displaying public tags in the multi stream	Ilya Zhitomirskiy

2011-11-05	use the stream element partials for testing the StreamElement widget instead ↵	Dan Hansen & Maxwell Salzberg
	of Aspects#index
2011-11-04	added a password field before account closure	Ilya Zhitomirskiy

2011-11-04	Allow non-logged-in users to see public photos	Sarah Mei

2011-11-04	DG MS; fix last failing spec	danielgrippi

2011-11-03	added ignore text on user pages if it applies	danielgrippi

2011-11-03	change 'mute' to 'ignore' for now; fix specs; repopulate cache upon	danielgrippi
	contact removal
2011-11-03	block user now removes a contact if user is blocking a contact	danielgrippi

2011-11-03	DH DG; don't display blocked people in stream; switch controls in stream; ↵	danielgrippi
	disallow blocking yourself
2011-11-03	DH DG; made privacy page; can now unblock a user; users are actually being ↵	danielgrippi
	blockocked in ajaxed streams
2011-11-03	Stream#posts no longer needs to call for_a_stream	Dan Hansen & Maxwell Salzberg
	exclude blocked users from all streams
2011-11-03	blocked users works for multi stream, cuke passes	Dan Hansen & Maxwell Salzberg
	fixed scoping stuff
2011-11-03	wip	Dan Hansen

2011-11-03	Merge pull request #2306 from Pistos/issue-2298-following-dot-tags	Daniel Grippi
	Issue 2298 following dot tags
2011-11-03	This fixes issue #2298.	Pistos
	Following a hashtag with a dot now no longer breaks the user's stream page. All unacceptable hashtag chars are stripped out, and the given tag is normalized before being followed.
2011-11-03	Refactor / shuffle code in TagFollowingsController spec.	Pistos

2011-11-03	add spec & change syntax in http_multi	danielgrippi

2011-11-03	Merge pull request #2251 from manuels/retry_federations	Daniel Grippi
	Retry federation if remote pod is down
2011-11-03	Merge pull request #2300 from Pistos/issue-2213-hashtag-markdown-em-collision	Daniel Grippi
	Issue 2213 hashtag markdown em collision
2011-11-02	Added extra spec to cover alleged bug case given in issue #2245 .	Pistos