nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11584 commits 4 branches 0 tags 121 MiB
Commit graph

37 commits

Author SHA1 Message Date
Dennis Collinson
755ff52452 turn asset pipeline debugging off 
there was a collision with the aspects-dropdown view in the new
publisher, also
it takes too much time with it on
 2012-03-28 19:01:44 -07:00
danielgrippi
06936bcdce stylesheets are basically now being served from sprockets 2012-03-27 18:07:20 -07:00
Maxwell Salzberg
cedc49bf09 MS DC; oauth keys are now pulled out of application.yml to be simplier. incldue newrelic as heroku expects it, without affecting people who do not use newrelic. If you do use new relic in production, you have to put your newrelic api key in application.yml 2012-01-05 17:31:38 -08:00
Maxwell Salzberg
85e51a6dd7 wip 2011-10-05 12:06:19 -07:00
Maxwell Salzberg
b5c3f2c615 wip 2011-10-03 15:22:14 -07:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
Maxwell Salzberg
7ff11188b6 update gemfile 2011-09-05 13:28:08 -07:00
Jamie Wilkinson
4a3cc59df9 Fix crazy slow dev-mode exception pages using targeted .inspect monkeypatches 2011-04-06 17:45:52 -07:00
Raphael
f043c9cc7e Took MongoMapper out of the bundle, trying to fix querying. 2010-12-20 16:53:56 -08:00
zhitomirskiyi
0b2e00b7d6 MS IZ the mailer will not be setup unless turned on in the APP_CONFIG 2010-10-26 17:46:19 -07:00
ilya
ad348ed24c trying the mailer_condig 2010-10-07 16:54:38 -07:00
ilya
9c59adee51 in dev env as well 2010-10-07 16:48:49 -07:00
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
ilya
720d1daa9e moved the mailer settings back into env 2010-10-07 15:40:18 -07:00
ilya
7aa49b277c moved the smtp setting to intializers 2010-10-07 14:36:08 -07:00
ilya
2a104ea622 Revert "moved the SMTP setting into app_config.yml" 
This reverts commit 2451ac4957.
 2010-10-07 14:26:59 -07:00
ilya
2451ac4957 moved the SMTP setting into app_config.yml 2010-10-07 14:20:31 -07:00
Stephen Caudill
536cea5e44 Remove consecutive empty lines 2010-09-25 12:06:39 -04:00
Raphael
70a22ae839 Merge branch 'master' into HEAD 
Conflicts:
	app/models/post.rb
	app/models/user.rb
	config/initializers/socket.rb
 2010-09-24 09:15:10 -07:00
Michael Fellinger
ba058a39a8 Replace require_relative with compatible version 2010-09-16 14:50:30 +09:00
Michael Fellinger
c6f5b4ed16 Basic 1.9.2 port 2010-09-16 14:41:33 +09:00
Raphael
de93fd2818 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 18:10:13 -07:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Raphael
1006e8a680 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 11:01:11 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
c1a9a89be7 Merge branch 'production' of github.com:diaspora/diaspora into production 
Conflicts:
	app/models/user.rb
	config/deploy.rb
	spec/factories.rb
	spec/models/request_spec.rb
	spec/spec_helper.rb
 2010-09-14 11:08:18 -07:00
Daniel Vincent Grippi
4c15b1a01c added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
maxwell
4f63f60b03 MS merging, and added a dumb check for the email validating twice 2010-08-24 14:03:57 -07:00
Raphael
ed99532a83 memory leak gone for real 2010-08-23 16:52:19 -07:00
Raphael
188f555c72 Actionmailer actually working 2010-08-17 15:47:41 -07:00
maxwell
a02a833625 updated rails for kicks, run bundle install, and run gem install bundler --pre rspec-rails --pre too 2010-07-10 00:32:58 -07:00
maxwell
cf80aa4010 merging master in.... now I am going to go back to 187 2010-06-22 10:32:13 -07:00
maxwell
531ab3ab83 turned off mutex in dev 2010-06-22 10:19:36 -07:00
maxwell
51279cd519 turned on mutex in dev. totally my bad 2010-06-22 10:12:13 -07:00
maxwell
5637fa4e4c update em-http-request, removed the mutex because we are thin. also removed some uneeded config for database cleaner in the test setup env 2010-06-19 15:48:50 -07:00
maxwell
1fcd758bd4 removed the mutex, added rack fiber pool. this thing screams 2010-06-19 15:07:12 -07:00
Raphael Sofaer
0390bbde8a Activerecord this time\! 2010-06-11 10:40:49 -07:00