nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/public
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
..
images halfway to a better welcome/getting started page. wip. 2011-05-08 22:15:26 -07:00
javascripts Merge branch 'master' into follow 2011-05-12 15:49:51 -07:00
stylesheets Merge branch 'master' into follow 2011-05-12 15:49:51 -07:00
well-known Add public/well-known dir for the moment. 2011-01-10 20:47:20 +01:00
404.html fix the 404 page to show the dun goofed guy 2011-01-13 17:31:18 -08:00
422.html Activerecord this time\! 2010-06-11 10:40:49 -07:00
500.html Issue #735: Image link fixed and CSS corrected 2010-12-20 12:09:30 -08:00
apple-touch-icon.png cleaned up meta and link tags in layout, added retina iOS icon, fixed error caused in stream_element when socketing 2010-11-17 21:21:00 -08:00
default.html make cursor a question mark on welcome page info text 2011-05-09 15:55:24 -07:00
favicon.ico make favicon more like apple-touch-icon 2010-12-11 21:00:34 -08:00
favicon.png png favicon 2011-05-09 16:24:24 -07:00
robots.txt update robots.txt to only exclude /people/ 2011-05-03 10:32:50 -07:00