Maxwell Salzberg
2f1118f95f
refactor AppConfig to guess what services are configured, and clean up the services view for a user. also, add a box so people can realize what they can connect
2011-07-04 13:54:05 -07:00
Raphael Sofaer
d1a149f9f6
Some stuff to not need an application.yml in CI
2011-06-29 11:52:13 -07:00
Raphael Sofaer
1af945de11
Merge branch 'master' into oauth
...
Conflicts:
Gemfile
Gemfile.lock
app/models/app_config.rb
app/models/post.rb
db/schema.rb
public/stylesheets/sass/application.sass
spec/lib/webfinger_spec.rb
2011-06-28 17:13:38 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
d46f3a8d1f
fixed every spec but the activity stream photos controller spec
2011-06-23 15:22:36 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
052adc3213
Fix authorizations controller and app_config specs, require 2048 bit keys. We're now using config/application.yml.example in the test env.
2011-06-23 14:20:53 -07:00
Ilya Zhitomirskiy
56525c9f4f
made a slightly nicer heads up about nil ca_file
2011-06-09 16:28:45 -07:00
Ilya Zhitomirskiy
71dd8dc7f3
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
app/models/app_config.rb
2011-06-09 15:51:59 -07:00
Raphael Sofaer
e1fb5846b6
Use the example config file if travis
2011-06-09 15:45:01 -07:00
Raphael Sofaer
ac8587290a
Throw in a travis config file to try using travis
2011-06-09 15:31:16 -07:00
Ilya Zhitomirskiy
a03423309d
fixed the getting started step 3, ignore the CA certs in developement is now in initializer, changed the 'login' -> 'connect' [to facebook] png
2011-06-09 15:12:35 -07:00
Ilya Zhitomirskiy
b575983c22
WIP certs
2011-06-08 18:46:38 -07:00
Ilya Zhitomirskiy
808754f8bd
added the cert bundle for facebook http things
2011-06-08 18:20:47 -07:00
Sarah Mei
828cbab792
Keep pod_url and pod_uri settings in sync.
2011-05-28 20:13:38 -07:00
Sarah Mei
31a5ef19de
Switching to settingslogic to manage our configuration. THE FILE FORMAT HAS CHANGED. OLD APP.YML AND APP_CONFIG.YML FILES WILL NOT WORK ANYMORE.
...
Two important differences:
1. The app only looks in one file for settings: config/application.yml. If you want to override something, do it in that file. It is gitignore'd. If config/application.yml does not exist, or exists but is in the old format, you'll get a nice friendly set of instructions on how to convert your old file.
2. script/server settings are no longer in application.yml. They have their own settings file - copy config/script_server_config.yml.example to config/script_server_config.yml. This is also gitignore'd. script/server will print a message and exit if that file doesn't exist.
2011-05-28 19:44:40 -07:00
