Jonne Haß b8128d356b Merge branch 'hotfix/0.0.2.4' into develop ... Conflicts: Changelog.md app/views/people/show.html.haml config/defaults.yml spec/helpers/layout_helper_spec.rb		2013-02-01 22:24:37 +01:00
..
deploy	capistrano deploy: let the user choose if running svc and svstat with sudo	2012-02-04 17:59:30 +01:00
environments	properly integrate asset_sync	2012-09-26 20:23:45 +02:00
initializers	Merge branch 'hotfix/0.0.2.4' into develop	2013-02-01 22:24:37 +01:00
locales	Fix uncapitalization of a word	2013-01-26 16:09:34 -02:00
application.rb	Load the entire lib folder refactor.	2012-12-30 13:08:16 +01:00
boot.rb	Do not generate paths like /a/b/c/config/boot.rb/../../Gemfile to require and open things, create a proper path instead.	2012-11-30 18:16:56 +01:00
cap_colors.rb
cucumber.yml	add cucumber feature for taking screenshots of important pages	2012-12-17 20:25:34 +01:00
database.yml.example	Release cleanup, closes #3620	2012-09-30 22:26:23 +02:00
defaults.yml	Fix XSS vulnerabilities caused by not escaping a users name fields when loading it from JSON. #3948	2013-02-01 22:20:31 +01:00
deploy.rb	New configuration system	2012-09-26 20:19:37 +02:00
deploy_config.yml.example	capistrano deploy: let the user choose if running svc and svstat with sudo	2012-02-04 17:59:30 +01:00
diaspora.yml.example	Write unicorn stderr and stdout log	2013-01-16 13:11:33 +01:00
environment.rb	Do not generate paths like /a/b/c/config/boot.rb/../../Gemfile to require and open things, create a proper path instead.	2012-11-30 18:16:56 +01:00
load_config.rb	don't use a rails method in a pre-rails environment	2012-12-08 00:50:30 +01:00
locale_settings.yml	made hy available, temporarily switched to git release of rails-i18n to fix #3023 [ci skip]	2012-10-07 14:30:29 +02:00
routes.rb	re-add hovercards	2012-12-28 22:37:13 +01:00
schedule.rb.example	Adds maintenance rake tasks for logrotate and temp file deletion; Adds whenever gem + sample whenever file	2011-12-15 15:18:07 -08:00
selenium.yml
thin.yml
unicorn.rb	Write unicorn stderr and stdout log	2013-01-16 13:11:33 +01:00