Dennis Schubert 0c78fcaae7 Merge branch 'next-minor' into develop		2016-11-06 02:34:16 +01:00
..
certs	Diaspora configuration wrapper for Prosody	2016-04-25 15:30:28 +02:00
environments	Speed up asset serving in development	2016-02-16 11:19:04 +01:00
initializers	Add dark theme	2016-11-06 02:34:11 +01:00
locales	updated 29 locale files [ci skip]	2016-11-06 02:31:20 +01:00
application.rb	Fix ID token issuer field to match discovery data	2016-10-27 02:22:27 +02:00
asset_sync.rb
boot.rb
color_themes.yml	Add dark theme	2016-11-06 02:34:11 +01:00
cucumber.yml
database.yml.example
defaults.yml	Start 0.6.2.0 cycle	2016-10-27 02:29:14 +02:00
diaspora.yml.example	Add settings for CSP to diaspora.yml	2016-09-30 02:11:32 +02:00
environment.rb
eye.rb	Diaspora configuration wrapper for Prosody	2016-04-25 15:30:28 +02:00
load_config.rb	Load diaspora.yml overrides for test env	2015-07-24 03:47:46 +02:00
locale_settings.yml	Update for sq translation	2015-12-27 17:49:39 +01:00
logging.rb	use DiasporaFederation::Salmon::MagicEnvelope for federation debug logging	2016-06-26 06:21:03 +02:00
oembed_providers.yml	Add media.ccc.de as trusted oEmbed endpoint	2015-12-28 16:42:34 +01:00
open_graph_providers.yml	Add OpenGraph video support	2016-09-04 03:55:09 +02:00
routes.rb	Add new JSON endpoint for reshares	2016-11-02 22:59:25 +01:00
schedule.rb.example
schedule.yml	fix queues for cron jobs	2016-01-28 23:46:37 +01:00
sidekiq.yml	Consolidate amount of sidekiq queues from 13 to 5	2016-08-10 08:51:22 +00:00
unicorn.rb	Add option to set a pid file for unicorn in diaspora.yml	2015-09-19 11:33:04 +02:00