Commit graph

1304 commits

Author SHA1 Message Date
Maciej Szlosarczyk
2636fe2525
Merge branch 'master' into registry-927 2018-08-31 14:25:59 +03:00
Artur Beljajev
3d51a93f95 Merge branch 'master' into registry-790 2018-08-27 15:24:05 +03:00
Maciej Szlosarczyk
8aa8aea24e
Merge branch 'master' into registry-927 2018-08-27 11:40:28 +03:00
Artur Beljajev
1f78856ea9 Merge branch 'master' into refactor-devise-integration 2018-08-25 17:29:00 +03:00
Artur Beljajev
4b2948986b Merge branch 'master' into registry-790
# Conflicts:
#	test/models/domain/force_delete_test.rb
#	test/system/admin_area/domains/force_delete_test.rb
2018-08-24 14:54:41 +03:00
Maciej Szlosarczyk
c92fc25683
Fix tests that failed after merging master
Also, fix rubocop issues
2018-08-24 13:22:58 +03:00
Maciej Szlosarczyk
0dc0ac4d16
Merge branch 'master' into registry-927 2018-08-24 12:58:29 +03:00
Artur Beljajev
b079220822 Remove unused routes 2018-08-22 00:22:07 +03:00
Artur Beljajev
211f8c9143 Fix home page link 2018-08-22 00:21:12 +03:00
Artur Beljajev
d65186dc29 Disallow scheduling "force delete" procedure on a discarded domain 2018-08-21 18:52:27 +03:00
Artur Beljajev
ffd389790c Merge branch 'master' into registry-791 2018-08-21 12:08:45 +03:00
Artur Beljajev
c48cdf68b6 Merge branch 'master' into registry-790 2018-08-20 21:20:52 +03:00
Artur Beljajev
60f451afcd Merge branch 'master' into refactor-devise-integration 2018-08-11 14:58:54 +03:00
Maciej Szlosarczyk
322d931856
Further massage rubocop issues 2018-08-10 15:18:53 +03:00
Maciej Szlosarczyk
647cb53404
Merge branch 'master' into registry-927 2018-08-10 14:30:38 +03:00
Artur Beljajev
48ad971af1 Add clarifying comment 2018-08-10 13:25:18 +03:00
Maciej Szlosarczyk
2a7caaa33e
Update routes 2018-08-10 13:21:44 +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
Artur Beljajev
1ff200576e Extract translations 2018-08-09 14:43:10 +03:00
Maciej Szlosarczyk
b18db19035
Fix error introduced by merge conflict 2018-08-09 14:07:06 +03:00
Maciej Szlosarczyk
9dd9d4b1d6
Merge branch 'master' into registrant-api-contacts-controller 2018-08-09 14:05:27 +03:00
Maciej Szlosarczyk
faeeb55bc7
Add badges to locked domains 2018-08-09 13:57:31 +03:00
Artur Beljajev
aa42220ca1 Customize login URLs for client certificate authentication
Certificate is now asked only when login form is submitted, not before
2018-08-09 13:46:27 +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
3673c69319
Add Registrant/Contacts endpoint 2018-08-01 14:57:41 +03:00
Maciej Szlosarczyk
5c39cb6917
Merge branch 'registry-918' into registry-922 2018-07-31 15:29:36 +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
024a993547 Use standard UI 2018-07-28 22:21:21 +03:00
Artur Beljajev
4b30234c86 Merge branch 'registry-791' into registry-790 2018-07-27 16:18:28 +03:00
Maciej Szlosarczyk
b33ad0d4e8
Add show action 2018-07-27 11:00:35 +03:00
Maciej Szlosarczyk
0ab9f6333f
Add API/Registrant/Domains route 2018-07-26 14:46:03 +03:00
Maciej Szlosarczyk
3adb85001a
Insert space into configuration example 2018-07-26 10:39:58 +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
06f5eb10d4
Use inflector rule to acronym Api to API 2018-07-24 12:02:58 +03:00
Maciej Szlosarczyk
42004f933f
Add IP block on authentication via EID
Also, correct mistakenly used 403 error code.
Update aplication-example.yml to include new functionality.
2018-07-24 11:33:51 +03:00
Maciej Szlosarczyk
35c3f0a5bf
Change Base64 encoding to be url_safe, add crude implementation of a Controller 2018-07-20 17:29:13 +03:00
Artur Beljajev
abe3df24e2 Extract translations 2018-07-19 21:57:27 +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
Artur Beljajev
97650e2a6a Fix root route 2018-07-19 16:55:42 +03:00
Artur Beljajev
1babdf33af Add comment 2018-07-19 16:32:47 +03:00
Artur Beljajev
7dcfdb0a5a Remove dead code 2018-07-19 15:22:42 +03:00
Artur Beljajev
2fce31e81b Remove Devise route customizations 2018-07-19 14:51:09 +03:00
Artur Beljajev
8606775035 Fix registrar area login URL 2018-07-19 14:45:18 +03:00
Artur Beljajev
e369d90e20 Make UI consistent 2018-07-19 00:23:17 +03:00
Artur Beljajev
2e1ed2733a Extract translation 2018-07-18 23:24:56 +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