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

59 commits

Author SHA1 Message Date
Raphael
a2bb8515f9 Update cap scripts to have separate staging and production environments, use bundler 2011-01-31 15:28:43 -08:00
Sarah Mei
6f1aee990c Database is cleaned between scenarios. Progress? 2010-12-28 20:03:58 -08:00
Raphael
f043c9cc7e Took MongoMapper out of the bundle, trying to fix querying. 2010-12-20 16:53:56 -08:00
maxwell
0a831cfbf4 invites are now on the queue 2010-12-03 19:33:54 -08:00
Jamie Wilkinson
0906f38f6d Use HAML ugly mode in production 2010-11-27 14:32:57 -08:00
danielvincent
4976503c0f let nginx serve static assets. 2010-11-12 11:47:19 -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
ilya
487637d5a3 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 16:42:49 -07:00
ilya
f022c2d8bd correct smtp server 2010-10-07 16:42:39 -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
Dorian
6ffc03a4c9 Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04: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
c67a8ea100 Merge branch 'master' of github.com:diaspora/diaspora into production 
Conflicts:
	config/deploy.rb
	config/environments/production.rb
	spec/models/request_spec.rb
 2010-09-15 22:37:05 -07:00
Jamie Wilkinson
fbdd50172d Cleanup stray whitespace 2010-09-16 10:07:59 +08:00
Jesse Kriss
969779a60d adding deprecation setting 2010-09-16 09:46:09 +08: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
701bec670f Merge branch 'master' of github.com:diaspora/diaspora into pivots 
Conflicts:
	app/views/groups/index.html.haml
	config/deploy_config.yml
 2010-08-18 20:50:28 -07:00
maxwell
6e2c42f8de MS app now works with rc1 2010-08-18 17:42:04 -07:00
Raphael
188f555c72 Actionmailer actually working 2010-08-17 15:47:41 -07:00
Raphael
a74ea7e80f Back to config actionmailer, the settings are getting set, try mail.joindiaspora.com 2010-08-17 15:31:14 -07:00
Raphael
46e7dbedac Trying to get actionmailer working 2010-08-17 15:19:41 -07:00
Raphael
f84d7962fc actionmailer config 2010-08-17 14:06:00 -07:00
Raphael
cbb1b550ff Default url 2010-08-17 14:03:30 -07:00
Raphael
2ede5f499f Commas 2010-08-17 13:53:15 -07:00
Raphael
424f576d95 Actionmailer config 2010-08-17 13:48:09 -07:00
Raphael
453cb06691 changing settings and deploy scripts, validating email 2010-08-17 11:01:30 -07:00
ilya
5dfc097c88 replaced the functionality with openssl, didn't do the encryption spec 2010-08-04 20:32:15 -07:00
ilya
8f70fb89c0 RS IZ Switching to production 2010-07-23 10:41:57 -07:00
ilya
3dfb55ee85 IZ MS pulled in master: this is now the authoritative branch; waiting for dan to fix gpg so we can move on 2010-07-11 00:04:08 -04:00
maxwell
603fc15120 MS IZ added the env setting line to factories 2010-07-10 23:54:25 -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
e558d4833f DG MS fixing tests 2010-06-24 20:45:49 -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