maxwell
21cdbf08b5
we need to ask to publish on peoples wall...this was working because we all installed it with minifb which asked for everything
2010-11-08 01:26:11 -08:00
Raphael
061ec59091
Merge remote branch 'jdeisenberg/511-nonstandard-mongo-port'
2010-11-04 19:55:09 -07:00
Raphael
7d125e68e9
Warn rather than failing if there is no smtp sender address
2010-11-04 16:55:15 -07:00
Raphael
c3a38eaab4
Merge remote branch 'MrZYX/396-smtp-sender-address'
2010-11-04 16:47:57 -07:00
Raphael
229e202a72
Take httponly off of session cookies so that the websocket works in firefox 3.x. XSS attacks would now be easier to exploit if found. A possible replacement for opening this security hole is to set a new cookie value for Firefox users that stores a randomly generated key which would give a websocket with that key access.
2010-11-04 15:17:28 -07:00
J David Eisenberg
c695688c63
Issue #511 : Nonstandard mongo port fails
2010-11-03 22:58:39 -07:00
Raphael
377cae8cba
Merge remote branch 'ed0h/i18n-fallbacks'
...
Conflicts:
pkg/ubuntu/dist
2010-11-01 15:57:43 -07:00
Raphael
399a8965cc
Merge remote branch 'ultrasaurus/365-app-config-warning'
2010-10-31 23:30:56 -07:00
livefromthemoon@gmail.com
bbd0d35070
Fix some bugs for I18n fallbacks
2010-10-31 22:39:54 +01:00
livefromthemoon@gmail.com
9e27797092
Fallback to default language when a translation is missing for the current language
2010-10-31 22:39:54 +01:00
livefromthemoon@gmail.com
cf82a0a9c8
Better to set the default locale in an initializer than in a before_filter
2010-10-31 22:39:54 +01:00
zhitomirskiyi
2c0a189df4
removed the session secret from the repo
2010-10-29 12:20:06 -07:00
Sarah Allen
ef2c8fbfdc
Rails.env is a string, not a symbol
2010-10-28 21:28:20 -07:00
zhitomirskiyi
21c75c08bb
removed the http inspect
2010-10-26 19:19:34 -07:00
zhitomirskiyi
c4b79aebc0
mongo query profing
2010-10-26 18:42:53 -07: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
Sarah Mei
33410899d9
Fix for build breakage
2010-10-25 21:38:53 -07:00
danielvincent
6ff94e67b3
remove unused fb_config.yml files. removed oauth_keys.yml from git, updated .example"
2010-10-25 17:50:04 -07:00
maxwell
c489f49a25
DG beginning to collapse twitter&facebook
2010-10-25 17:41:58 -07:00
maxwell
c4ff07b09a
twitter oauth dance complete
2010-10-25 17:41:58 -07:00
ilya
b337d5acc9
delivery method test in tests
2010-10-22 16:36:54 -07:00
ilya
47b03c45b2
commented out the email interceptor
2010-10-22 10:37:04 -07:00
maxwell
5701c3a873
should send the email when a new request is received. emails in dev should be intercepted to email@joindiaspora.com for now
2010-10-22 00:49:01 -07:00
MrZYX
5fa623552d
made smtp sender address configurable
2010-10-21 19:47:30 +02:00
danielvincent
9bfb213465
Merge branch 'invites' of github.com:diaspora/diaspora into invites
2010-10-11 11:52:57 -07:00
Alec Leamas
0c30f544d9
Fallback to static version data if git unavailable.
...
Uses the file config/gitversion if git is unavailable. This is to
support deployment without git (which will be necessary). Installation
script will generate the file config/gitversion when app is shipped.
2010-10-10 16:38:01 +02:00
ilya
9a34ca07c4
Merge branch 'master' of github.com:diaspora/diaspora into invites
2010-10-07 19:25:42 -07:00
ilya
ddb98502b9
setup the controller, still need to make the person
2010-10-07 19:25:34 -07:00
danielvincent
75aadc5c57
DG MS; cleaned up routes, killed all deprication warnings in everything. totally legit.
2010-10-07 18:25:59 -07:00
danielvincent
2e73104d6f
DG MS; updated BSON gems, added devise-mongomapper gem fix, using unforked devise 1.1.2
2010-10-07 18:17:26 -07:00
ilya
97f058c625
moving to app config yml
2010-10-07 17:00:38 -07:00
ilya
ad348ed24c
trying the mailer_condig
2010-10-07 16:54:38 -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
8fae836b65
isolating the problem
2010-10-07 15:28:58 -07:00
ilya
e174722315
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 15:06:03 -07:00
ilya
43600905dc
trying making the port an int
2010-10-07 15:05:52 -07:00
Raphael
a01a059293
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 14:47:32 -07:00
ilya
7aa49b277c
moved the smtp setting to intializers
2010-10-07 14:36:08 -07:00
Raphael
9912769b5b
Merge remote branch 'guillei/s3_upload'
2010-10-07 14:17:43 -07:00
Crimer
56ed245db0
MongoMapper now not overrides database name in MONGOHQ_URL configuration if provided. It also works on Heroku.
2010-10-07 14:29:17 +00:00
ilya
b823213c0d
added a generate:secret_token task, and added an initializer to generate one if the file does not exist
2010-09-27 15:29:55 -07:00
Dorian
6ffc03a4c9
Big clean up: delete trailing whitespace
2010-09-26 12:48:40 -04:00
Guillermo
6e0082da9e
Files are uploaded to S3 if the ENV variables are set (Heroku-friendly)
2010-09-26 11:03:47 -05:00
Stephen Caudill
536cea5e44
Remove consecutive empty lines
2010-09-25 12:06:39 -04:00
Raphael
beda67aca6
Shorten git show stuff
2010-09-24 17:51:51 -07:00
Raphael
2489f8503f
Merge branch 'master' into HEAD
...
Conflicts:
app/controllers/albums_controller.rb
app/controllers/aspects_controller.rb
app/controllers/photos_controller.rb
app/controllers/registrations_controller.rb
app/controllers/requests_controller.rb
app/helpers/dashboards_helper.rb
app/views/albums/show.html.haml
app/views/aspects/manage.html.haml
app/views/shared/_aspect_nav.haml
app/views/shared/_sub_header.haml
app/views/status_messages/_status_message.html.haml
app/views/status_messages/show.html.haml
config/locales/de.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
2010-09-22 21:32:03 -07:00
danielvincent
8941975224
DG IZ; example extension convention for app_config
2010-09-22 10:59:23 -07:00
ilya
6d6ca3d8bc
added terse_pod_url to the APP_CONFIG hash
2010-09-21 20:01:56 -07:00
ilya
96aaf3093c
Make load_app_config more robust, point to the right folder in db seed
2010-09-21 18:04:36 -07:00
