Merge branch 'master' into redux-polling
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
# coding: utf-8
|
||||
# Default admin user (change password after first deploy to a server!)
|
||||
if Administrator.count == 0 && !Rails.env.test?
|
||||
admin = User.create!(username: 'admin', email: 'admin@consul.dev', password: '12345678', password_confirmation: '12345678', confirmed_at: Time.now, terms_of_service: "1")
|
||||
admin = User.create!(username: 'admin', email: 'admin@consul.dev', password: '12345678', password_confirmation: '12345678', confirmed_at: Time.current, terms_of_service: "1")
|
||||
admin.create_administrator
|
||||
end
|
||||
|
||||
@@ -65,6 +65,7 @@ Setting['feature.twitter_login'] = true
|
||||
Setting['feature.facebook_login'] = true
|
||||
Setting['feature.google_login'] = true
|
||||
Setting['feature.public_stats'] = true
|
||||
Setting['feature.signature_sheets'] = true
|
||||
|
||||
# Spending proposals feature flags
|
||||
Setting['feature.spending_proposal_features.voting_allowed'] = true
|
||||
@@ -81,4 +82,8 @@ Setting['banner-img.banner-img-three'] = "Banner image 3"
|
||||
|
||||
# Proposal notifications
|
||||
Setting['proposal_notification_minimum_interval_in_days'] = 3
|
||||
Setting['direct_message_max_per_day'] = 3
|
||||
Setting['direct_message_max_per_day'] = 3
|
||||
|
||||
# Email settings
|
||||
Setting['mailer_from_name'] = 'Consul'
|
||||
Setting['mailer_from_address'] = 'noreply@consul.dev'
|
||||
|
||||
Reference in New Issue
Block a user