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

Age	Commit message (Collapse)	Author
2011-11-06	added translateable text to inbox thread times	buddhamagnet

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 pull request #2336 from dmorley/patch-3	Raphael Sofaer
	blacklist example admin username
2011-11-06	blacklist example admin username	David Morley

2011-11-06	also link to the translated tag	Jonne Hass

2011-11-06	http://podup.sargodarya.de is now 5 months out of date, most pods are gone ↵	David Morley
	on there, listings are all wrong. changed to podupti.me
2011-11-06	made help tags translatable so that local communities can take care of the ↵	Jonne Hass
	new users, also fixed #2327
2011-11-06	supress resque retries	Jonne Hass

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	fixed 500 error if one is opening people's photos view and there are no ↵	Jakob Kramer
	images in the user's stream
2011-11-06	give correct scope in order clause	Jonne Hass

2011-11-06	do not assume mysql ordering in StatusMessage#tag_stream	Jonne Hass

2011-11-06	do not send Expect header as many server don't like it	Jonne Hass

2011-11-06	Fix require problem with the acts_as_taggable patches	Sarah Mei

2011-11-06	Differentiate between oauth features and non-oauth features for travis.	Sarah Mei

2011-11-06	Add oauth features to travis as a separate build. Combinatoric explosion FTW	Sarah Mei

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	improved UX for ca_file setting [ci:skip]	Jonne Hass

2011-11-06	make service icons larger	danielgrippi

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	give warden a failure app	Jonne Hass

2011-11-06	Run ostatus builder spec that sometimes causes nokogiri to segfault	Sarah Mei

2011-11-06	Merge branch 'master' of github.com:diaspora/diaspora	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-06	updated 54 locale files [ci skip]	Jonne Hass

2011-11-06	decode the cookie through rails in the websocket server. Hopefully this is ↵	Jonne Hass
	more stable
2011-11-05	show service icons on mobile site	Dan Hansen & Maxwell Salzberg

2011-11-05	websocket really should stay running so catch TypeError too	Jonne Hass

2011-11-05	ugly thing to prevent crashing websocket for dmorley, hopefully	Jonne Hass

2011-11-05	add participant_users to conversations	Jonne Hass

2011-11-05	improved closing account experience and fixed the cuke	Jonne Hass

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	Oh yeah, change travis config too. :p	Sarah Mei

2011-11-05	try breaking up travis build into components	Sarah Mei

2011-11-05	Merge pull request #2315 from Pistos/ie-make-user-menu-work	Daniel Grippi
	Total hax, but this is better than the user menu completely not working.
2011-11-05	MS DG; for real this time?	Maxwell Salzberg

2011-11-05	MS DG; actually fix the bug	Maxwell Salzberg

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

2011-11-05	dont ban diasporahq stuff	Maxwell Salzberg

2011-11-05	Merge branch 'participants'	Maxwell Salzberg

2011-11-05	fix spelling and update job to use less obtrusive query	Maxwell Salzberg

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

2011-11-05	MS DG add participants	Maxwell Salzberg

2011-11-05	dry up multi stream	Maxwell Salzberg

2011-11-05	dry up multi stream	Maxwell Salzberg

2011-11-05	fix update public_tag_stream	Maxwell Salzberg