Commit graph

2361 commits

Author SHA1 Message Date
Maciej Szlosarczyk
a7a07ac93a
Insert whitespace for consistency, change save for save! 2018-08-10 15:25:28 +03:00
Maciej Szlosarczyk
322d931856
Further massage rubocop issues 2018-08-10 15:18:53 +03:00
Maciej Szlosarczyk
9d7dc59652
Fix rubocop issues and a stray typo spotted along the way 2018-08-10 14:43:06 +03:00
Maciej Szlosarczyk
194adec9d3
Foo 2018-08-10 13:17:08 +03:00
Artur Beljajev
732997bf9e Merge branch 'registry-791' into registry-790
# Conflicts:
#	app/views/admin/domains/edit.html.erb
#	config/locales/admin/domains.en.yml
2018-08-09 16:42:43 +03:00
Artur Beljajev
1d79f6548d Merge branch 'master' into registry-790
# Conflicts:
#	test/integration/epp/domain/domain_delete_test.rb
#	test/integration/epp/domain/domain_update_test.rb
#	test/integration/epp/domain/transfer/request_test.rb
#	test/system/admin_area/domains_test.rb
2018-08-09 15:01:23 +03:00
Artur Beljajev
dbace4cbc5 Merge branch 'master' into refactor-devise-integration 2018-08-09 14:51:22 +03:00
Timo Võhmar
015e620260
Merge pull request #921 from internetee/registry-918
Registrant API authentication
2018-08-09 14:02:57 +03:00
Artur Beljajev
1d95c1ccbc Use standard login form 2018-08-09 13:43:11 +03:00
Maciej Szlosarczyk
dffe865d89
Add ability for admin to remove registry lock 2018-08-08 15:43:29 +03:00
Maciej Szlosarczyk
43f65cc0aa
Add Domain::Lockable concern 2018-08-06 15:56:17 +03:00
Artur Beljajev
cc36e3ccea Forbid cancelling force delete procedure when a domain is discarded 2018-07-29 20:42:29 +03:00
Artur Beljajev
c49d626f86 Remove dead code 2018-07-28 14:27:36 +03:00
Artur Beljajev
4b30234c86 Merge branch 'registry-791' into registry-790 2018-07-27 16:18:28 +03:00
Maciej Szlosarczyk
aac76b333c
Revert "Use inflector rule to acronym Api to API"
This reverts commit 06f5eb10d4.
2018-07-24 12:53:51 +03:00
Maciej Szlosarczyk
90b2455032
Fix codeclimate issues 2018-07-24 12:29:25 +03:00
Maciej Szlosarczyk
06f5eb10d4
Use inflector rule to acronym Api to API 2018-07-24 12:02:58 +03:00
Maciej Szlosarczyk
65676ae637
Rename private method 2018-07-23 15:00:37 +03:00
Maciej Szlosarczyk
f92ece5467
Refactor common part of the find_or_create_by_x into a private method 2018-07-23 14:29:16 +03:00
Artur Beljajev
07bc0546bb Handle past domains.delete_at 2018-07-22 23:58:25 +03:00
Artur Beljajev
106592e53e Merge branch 'master' into registry-791
# Conflicts:
#	db/structure.sql
2018-07-19 20:40:45 +03:00
Artur Beljajev
e4305e7865 Merge branch 'master' into registry-790 2018-07-19 17:28:56 +03:00
Maciej Szlosarczyk
dad57ba528
Implement the basic interface for the Authentication endpoint
* Handle errors as 422
* Require parameters through strong_parameters
* Use a custom rescue_from
2018-07-19 16:20:58 +03:00
Maciej Szlosarczyk
1c6b838b2b
Add auth-token class 2018-07-19 10:31:31 +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
a651ac8cab Fix Rubocop warnings 2018-07-15 19:50:15 +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
e5cdb2e8db Merge branch 'master' into refactor-devise-integration
# Conflicts:
#	app/controllers/registrant/contacts_controller.rb
#	config/routes.rb
2018-07-10 18:09:03 +03:00
Maciej Szlosarczyk
3e81366cfc
Add affected domain parameter to REST API response 2018-07-05 17:24:32 +03:00
Maciej Szlosarczyk
b5f07682f4
Make replace_nameservers return an array of domain names 2018-07-05 16:15:32 +03:00
Timo Võhmar
68faff40cc
Merge pull request #894 from internetee/registry-757
Registry 757
2018-06-26 14:28:05 +03:00
Maciej Szlosarczyk
8fb3d511c2
Remove clean_pendings_lowlevel method 2018-06-26 11:37:31 +03:00
Timo Võhmar
5e7934d00d
Merge pull request #890 from internetee/change-directo-date-format
Change date format
2018-06-25 12:38:48 +03:00
Timo Võhmar
ea3f3ac43a
Merge pull request #888 from internetee/improve-registrant-area
Improve registrant area
2018-06-22 13:13:58 +03:00
Timo Võhmar
9630a2d5ec
Merge pull request #882 from internetee/remove-dead-code
Remove unused code
2018-06-22 12:43:54 +03:00
Artur Beljajev
f299241b28 Merge branch 'master' into registry-791
# Conflicts:
#	db/structure.sql
2018-06-21 17:38:38 +03:00
Timo Võhmar
8c7b2e0a79
Merge pull request #877 from internetee/fix-country-dropdown
Fix country drop-down UI
2018-06-21 15:51:44 +03:00
Timo Võhmar
81f70c7d64
Merge pull request #873 from internetee/add-uuid-db-columns
Add UUID db columns
2018-06-21 15:22:11 +03:00
Artur Beljajev
d84d7cf772 Do not use bang version of methods 2018-06-20 15:17:27 +03:00
Artur Beljajev
1091fe7109 Change date format 2018-06-20 14:44:34 +03:00
Artur Beljajev
c31f507c25 Specify Devise modules for each type of user 2018-06-19 22:20:52 +03:00
Artur Beljajev
450a95f628 Revert "Remove routing specs"
This reverts commit bb39d0340e.
2018-06-19 21:08:44 +03:00
Artur Beljajev
c538579d5b Remove rememberable and lockable modules from AdminUser 2018-06-19 20:36:06 +03:00
Artur Beljajev
bb39d0340e Remove routing specs 2018-06-19 20:24:52 +03:00
Artur Beljajev
e564b331ab Merge branch 'remove-dev-rake-task' into improve-registrant-area 2018-06-18 18:05:43 +03:00
Artur Beljajev
20c99bd53a Revert "Pull up Devise module"
This reverts commit 58effbb
2018-06-18 17:44:36 +03:00
Artur Beljajev
3ef26082a8 Merge branch 'remove-dev-rake-task' into improve-registrant-area 2018-06-18 17:17:57 +03:00
Artur Beljajev
58effbb7c3 Pull up Devise module 2018-06-18 16:46:49 +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
4934a0c8e6 Remove unused method 2018-06-18 15:05:02 +03:00