Merge branch 'master' of github.com:internetee/registry

Conflicts:
	db/schema.rb

config/application.rb

@@ -27,8 +27,6 @@ module Registry
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 
-    config.autoload_paths += %W(#{config.root}/lib)
-
     config.generators do |g|
       g.stylesheets false
       g.javascripts false

config/locales/en.yml

@@ -202,13 +202,6 @@ en:
               taken: 'Public key already exists'
               blank: 'Public key is missing'
 
-
-        delegation_signer:
-          attributes:
-            dnskeys:
-              out_of_range: 'DNS keys count must be between %{min}-%{max}'
-
-
     attributes:
       epp_domain: &epp_domain_attributes
         name: 'Domain name'
@@ -224,6 +217,13 @@ en:
         alg: 'Algorithm'
         public_key: 'Public key'
 
+      zonefile_setting:
+        ttl: 'TTL'
+        refresh: 'Refresh'
+        retry: 'Retry'
+        expire: 'Expire'
+        minimum_ttl: 'Minimum TTL'
+        email: 'E-Mail'
 
   errors:
     messages:
@@ -266,7 +266,6 @@ en:
     registrar: 'Registrar'
     owner: 'Owner'
     domain_details: 'Domain details'
-    domain_history: 'Domain history'
     registered_at: 'Registered at'
     password: 'Password'
     valid_from: 'Valid from'
@@ -413,14 +412,6 @@ en:
     authentication_error: 'Authentication error'
     ds_data_and_key_data_must_not_exists_together: 'dsData and keyData objects must not exists together'
 
-    ns_min_count: 'Nameserver minimum count'
-    ns_max_count: 'Nameserver maximum count'
-    dnskeys_min_count: 'DNS keys minimum count'
-    dnskeys_max_count: 'DNS keys maximum count'
-    ds_data_allowed: 'DS data allowed'
-    ds_data_with_key_allowed: 'Allow DS data with key'
-    key_data_allowed: 'Allow key data'
-    ds_algorithm: 'DS algorithm'
     setting: 'Setting'
 
   registrar: 'Registrar'
@@ -431,3 +422,18 @@ en:
   zonefile: 'Zonefile'
   only_one_parameter_allowed: 'Only one parameter allowed: %{param_1} or %{param_2}'
   required_parameter_missing_choice: 'Required parameter missing: %{param_1} or %{param_2}'
+  transfer_wait_time: 'Transfer wait time'
+  ns_min_count: 'Nameserver minimum count'
+  ns_max_count: 'Nameserver maximum count'
+  dnskeys_min_count: 'DNS keys minimum count'
+  dnskeys_max_count: 'DNS keys maximum count'
+  ds_data_allowed: 'DS data allowed'
+  ds_data_with_key_allowed: 'Allow DS data with key'
+  key_data_allowed: 'Allow key data'
+  ds_algorithm: 'DS algorithm'
+  zonefile_settings: 'Zonefile settings'
+  background_jobs: Background jobs
+  domain_history: Domain history
+  domains_history: Domains history
+  admin_users: Admin users
+  epp_users: EPP users

config/routes.rb

@@ -9,11 +9,9 @@ Rails.application.routes.draw do
   namespace(:admin) do
     resources :zonefiles
 
-    resources :domains do
-      member do
-        get 'zonefile'
-      end
-    end
+    resources :zonefile_settings
+
+    resources :domains
     resources :settings
     resources :registrars do
       collection do