Commit graph

372 commits

Author SHA1 Message Date
Artur Beljajev
3d51a93f95 Merge branch 'master' into registry-790 2018-08-27 15:24:05 +03:00
Artur Beljajev
096035ae11 Revert old behaviour 2018-08-08 22:28:09 +03:00
Artur Beljajev
5561825584 Use standard Devise sessions controller in admin area
Fixes a bug when retrying to login with correct credentials
2018-07-18 20:02:05 +03:00
Artur Beljajev
989bb32548 Improve readability 2018-07-16 01:31:36 +03:00
Artur Beljajev
a651ac8cab Fix Rubocop warnings 2018-07-15 19:50:15 +03:00
Artur Beljajev
f6ad22156e Supply PaperTrail with current user 2018-07-13 23:13:58 +03:00
Artur Beljajev
32ecf36057 Rename users.password to users.plain_text_password
Otherwise it conflicts with Devise
2018-07-13 23:09:21 +03:00
Artur Beljajev
9684c8e59f Refactor Devise integration
- Use scoped users
- Use the named route helpers instead of hardcoded paths
2018-06-20 12:21:22 +03:00
Artur Beljajev
28416a3375 Use singular controller 2018-06-19 20:43:23 +03:00
Artur Beljajev
5b821f4074 Merge branch 'master' into registry-790
# Conflicts:
#	app/models/domain_cron.rb
#	lib/tasks/dev.rake
2018-06-18 16:27:56 +03:00
Artur Beljajev
c44f3df7f5 Remove Rubocop inline directives 2018-06-07 19:17:16 +03:00
Artur Beljajev
65b40997ca Merge branch 'master' into registry-790 2018-06-04 04:02:33 +03:00
Maciej Szlosarczyk
15a651e51b
Fix Rubocop issues after Ruby upgrade 2018-04-27 15:23:49 +03:00
Maciej Szlosarczyk
cec05c3943
Test and fix contact_versions controller affected by the same bug 2018-04-24 13:19:34 +03:00
Maciej Szlosarczyk
a93228c579
Extract block to helper function 2018-04-24 13:19:11 +03:00
Artur Beljajev
9d6a5910e3 Merge branch 'master' into registry-790 2018-04-15 19:11:20 +03:00
Artur Beljajev
bee233e00b Fix incorrect method
#623
2018-04-12 12:06:42 +03:00
Artur Beljajev
cc4a244844 Enable to keep a domain
#790
2018-04-08 18:52:32 +03:00
Artur Beljajev
90a4e11ce4 Improve readability
#790
2018-04-08 16:07:08 +03:00
Artur Beljajev
b4ed8f6c82 Remove double load
#790
2018-04-08 16:01:00 +03:00
Artur Beljajev
4dc7723554 Remove dead code
#790
2018-04-08 15:53:29 +03:00
Artur Beljajev
837f326ef6 Merge branch 'master' into registry-623
# Conflicts:
#	app/controllers/admin/registrars_controller.rb
#	app/models/registrar.rb
#	app/views/admin/registrars/_billing.html.erb
#	app/views/admin/registrars/show.html.erb
#	config/locales/admin/registrars.en.yml
#	config/locales/en.yml
#	db/migrate/20180309053424_add_registrars_unique_constraints.rb
#	db/structure.sql
#	test/fixtures/registrars.yml
#	test/integration/admin/registrars/delete_test.rb
#	test/integration/admin/registrars/new_test.rb
#	test/models/registrar_test.rb
2018-03-29 12:13:59 +03:00
Artur Beljajev
0f6a47d73d Refactor registrars
#765
2018-03-26 07:00:54 +03:00
Artur Beljajev
b68fe6e312 Rename attributes
#623
2018-03-13 11:32:15 +02:00
Artur Beljajev
f1fb17a42c Merge branch 'registry-765' into registry-623 2018-03-10 13:28:39 +02:00
Artur Beljajev
1b87c0bbc6 Merge branch 'master' into registry-765
# Conflicts:
#	app/views/admin/registrars/show.html.erb
#	db/structure.sql
2018-03-10 13:25:01 +02:00
Artur Beljajev
4f51f6c736 Merge branch 'registry-765' into registry-623
# Conflicts:
#	app/models/registrar.rb
#	config/locales/en.yml
#	spec/models/registrar_spec.rb
#	test/models/registrar_test.rb
2018-03-09 09:30:05 +02:00
Artur Beljajev
a5869e0eca Refactor registrars
#765
2018-03-09 09:23:21 +02:00
Artur Beljajev
f7301c3aea Remove unused attribute
Closes #747
2018-03-08 14:36:19 +02:00
Artur Beljajev
b2a38ae4e9 Re-order arguments
#623
2018-02-28 11:36:49 +02:00
Artur Beljajev
9e4fd48c70 Fix style
#623
2018-02-28 11:10:08 +02:00
Artur Beljajev
c47ca77ca6 Add registrar VAT rate
#623
2018-02-28 09:25:10 +02:00
Artur Beljajev
e0960bcca4 Extract class
#727
2018-02-24 20:38:16 +02:00
Artur Beljajev
6a7a705fa8 Do not use background job to send force delete email notification
#727
2018-02-24 13:18:56 +02:00
Artur Beljajev
b5870d3eb5 Allow skipping email notification on domain force delete
#727
2018-02-24 13:05:04 +02:00
Artur Beljajev
ad75564e97 Use _url helper instead of _path
#727
2018-02-24 12:00:59 +02:00
Artur Beljajev
77b24fdbd1 Add registrar language
#640
2017-11-23 07:09:16 +02:00
Artur Beljajev
411af16f9c Merge branch 'migrate-fabricators-to-factory-bot-factories' into registry-343 2017-11-15 15:46:54 +02:00
Artur Beljajev
59e1e18d32 Require registrar's accounting customer code
#343
2017-10-27 11:56:54 +03:00
Artur Beljajev
396f74cfb1 Reformat code
#343
2017-10-26 19:35:08 +03:00
Artur Beljajev
d520b5b157 Revert "Revert "Registry 569""
This reverts commit 4786dbb
2017-10-22 23:57:11 +03:00
Artur Beljajev
574113152a Fix class path
#611
2017-10-12 06:34:49 +03:00
Timo Võhmar
4786dbb943 Revert "Registry 569" 2017-10-05 16:08:47 +03:00
Timo Võhmar
9565f23e68 Merge pull request #577 from internetee/registry-569
Registry 569
2017-10-05 15:47:28 +03:00
Artur Beljajev
e4740f3f32 Merge branch 'master' into registry-569
# Conflicts:
#	app/controllers/admin/contacts_controller.rb
2017-09-11 17:09:58 +03:00
Artur Beljajev
b632dbc2de Move setting types from controller to model 2017-08-23 01:24:01 +03:00
Artur Beljajev
6d7701e52f Remove unused code 2017-08-22 23:09:34 +03:00
Artur Beljajev
4bbea0d58b Extract admin settings translations 2017-08-22 22:52:17 +03:00
Artur Beljajev
a63b989cd6 Use BaseController in admin 2017-08-22 01:17:50 +03:00
Artur Beljajev
feb8d83a26 Improve Ident validation, extract Ident from Contact
#569
2017-08-18 13:24:56 +03:00