nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/config
History
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
..
deploy Make cap deploy follow a branch in deploy_config.yml 2011-02-09 16:07:24 -08:00
environments Fix crazy slow dev-mode exception pages using targeted .inspect monkeypatches 2011-04-06 17:45:52 -07:00
initializers added spec; rtl? -> direction_for 2011-04-03 04:20:08 +02:00
locales Merge branch 'master' into follow 2011-05-04 11:35:35 -07:00
app_config.yml.example in most configuration example I've seen the cert comes before the key ;) 2011-05-02 22:35:37 +02:00
application.rb Changing message to text, partway done, deleted data conversion 2011-03-14 11:39:31 -07:00
assets.yml Merge branch 'master' into follow 2011-05-04 11:35:35 -07:00
boot.rb Add or later to license notice 2010-10-07 16:25:34 -07:00
cucumber.yml suburi cucumber test. 2010-12-29 10:31:25 +01:00
database.yml.example improved database.yml.example 2011-04-30 00:56:35 +02:00
deploy.rb Increase time between thin restarts, rescue jasmine load failure for deploying without test gems 2011-04-06 14:32:46 -07:00
deploy_config.yml.example Update cap scripts to have separate staging and production environments, use bundler 2011-01-31 15:28:43 -08:00
environment.rb fixed #589, no CSS! 2011-04-03 02:10:41 +02:00
locale_settings.yml added japanese 2011-05-04 15:47:02 +02:00
oauth_keys.yml.example changed back consumer_token to consumer_key as its not only more consistent with twitters website it also causes less support (less users complaining that their twitter integration is broken) :) 2010-12-03 16:04:37 +01:00
redis.yml Revert "Revert redis merge to fix bugs on master" 2010-12-02 15:33:26 -08:00
routes.rb Merge branch 'master' into follow 2011-05-04 11:35:35 -07:00
selenium.yml Add or later to license notice 2010-10-07 16:25:34 -07:00
server.sh removed RAILS_ENV=test example from config/server.sh 2011-03-01 17:28:35 +01:00
thin.yml Add or later to license notice 2010-10-07 16:25:34 -07:00