nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/lib
History
danielgrippi 60a60733df Merge branch 'master' into follow 
Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/contacts_controller.rb
	app/controllers/people_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/notifications_helper.rb
	app/models/notifications/new_request.rb
	app/models/user_preference.rb
	public/javascripts/view.js
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
	spec/controllers/home_controller_spec.rb
	spec/controllers/post_visibilities_controller_spec.rb
	spec/controllers/requests_controller_spec.rb
	spec/mailers/notifier_spec.rb
	spec/models/user_spec.rb
2011-05-12 15:49:51 -07:00
..
cruise
diaspora added a pane for people sharing with you on all aspect page 2011-05-04 17:57:42 -07:00
postzord Merge branch 'master' into follow. all specs green. 2011-04-11 17:48:37 -07:00
salmon
tasks Move rspec rake stuff into loaderror begin-rescue so that we can deploy with --without test 2011-04-06 14:44:04 -07:00
active_record_instantiation_logs.rb LOG MORE STUFF 2011-03-09 14:29:49 -08:00
app_config.rb handle the case that admins is unset in the app_config.yml 2011-03-09 20:03:46 +01:00
chrome_frame.rb
collect_user_photos.rb Fix stream on pages other than 1, rename raw_visible_posts to visible_posts 2011-04-13 14:35:20 -07:00
development_mail_interceptor.rb
diaspora.rb
direction_detector.rb fixed for ruby 1.9 2011-04-03 22:11:52 +02:00
encryptor.rb
fake.rb Fix stream on pages other than 1, rename raw_visible_posts to visible_posts 2011-04-13 14:35:20 -07:00
hcard.rb
log_overrider.rb reenable logging 2011-04-28 09:38:28 -07:00
postzord.rb
pubsubhubbub.rb slight tweaks to pubsubhubub publishing 2011-03-10 12:17:34 -08:00
rake_helpers.rb
resque_job_logging.rb
splunk_logging.rb add space before adding pid to logline 2011-05-08 21:36:27 +02:00
webfinger.rb whoops, let's not break inital fetching 2011-04-09 20:21:27 +02:00
webfinger_profile.rb Remove stray puts 2011-03-21 17:12:54 -07:00
youtube_titles.rb Added spec for YOUTUBE_ID_REGEX, we can easily add more youtube url sample here later to avoid polluting application_helper spec 2011-05-06 00:47:40 +08:00