Commit graph

3514 commits

Author SHA1 Message Date
Artur Beljajev
3d51a93f95 Merge branch 'master' into registry-790 2018-08-27 15:24:05 +03:00
Timo Võhmar
3ce0ae9941
Merge pull request #939 from internetee/add-body-css-class
Generate <body> CSS class for every action for better styling
2018-08-27 12:18:30 +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
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
cd633d0a4b Output rake task results 2018-08-21 00:53:25 +03:00
Artur Beljajev
31935a933f Take NULL into account 2018-08-21 00:39:04 +03:00
Artur Beljajev
c48cdf68b6 Merge branch 'master' into registry-790 2018-08-20 21:20:52 +03:00
Artur Beljajev
30fb22af42 Generate <body> CSS class for every action for better styling 2018-08-17 15:39:06 +03:00
Artur Beljajev
773b2116ef Merge branch 'master' into refactor-devise-integration 2018-08-17 14:54:23 +03:00
Maciej Szlosarczyk
066123bcf7
Replace gsub with tr for better performance 2018-08-16 13:33:09 +03:00
Maciej Szlosarczyk
c028c0e477
Add more tests to deposit handling 2018-08-15 20:18:07 +03:00
Artur Beljajev
48479dd70b Integrate master 2018-08-15 16:35:17 +03:00
Maciej Szlosarczyk
b8c082090e
Rename a variable from minimum_deposit to minimum_allowed_amount 2018-08-15 16:33:04 +03:00
Maciej Szlosarczyk
0ea1045259
Fix rubocop issues 2018-08-15 12:46:36 +03:00
Maciej Szlosarczyk
b4b404888b
Disallow deposits that are lower than 0.01 EUR 2018-08-15 12:25:19 +03:00
Artur Beljajev
60f451afcd Merge branch 'master' into refactor-devise-integration 2018-08-11 14:58:54 +03:00
Artur Beljajev
77ee9db02d Use _path helper instead of _url 2018-08-10 13:52:46 +03:00
Artur Beljajev
ba24e42cec Remove useless spec 2018-08-10 13:52:13 +03:00
Artur Beljajev
7e9250deb6 Use scoped current user 2018-08-10 13:12:26 +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
Maciej Szlosarczyk
c186929be4
Use single quote instead of double quotes 2018-08-09 15:28:43 +03:00
Maciej Szlosarczyk
256d2b7de4
Add test for error in business registry 2018-08-09 15:24:21 +03:00
Maciej Szlosarczyk
4cc0669286
Add business registry support for contacts controller 2018-08-09 15:04:22 +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
9dd9d4b1d6
Merge branch 'master' into registrant-api-contacts-controller 2018-08-09 14:05:27 +03:00
Timo Võhmar
71c74a66f8
Merge pull request #926 from internetee/registry-922
Registrant API domain endpoint
2018-08-09 14:03:36 +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
8c744f091b Remove unneeded attribute 2018-08-09 13:49:26 +03:00
Artur Beljajev
1d95c1ccbc Use standard login form 2018-08-09 13:43:11 +03:00
Artur Beljajev
080defa228 Fix home page URL for anonymous users of registrar area 2018-08-09 13:39:48 +03:00
Artur Beljajev
0d770137b6 Convert HAML to ERB 2018-08-08 22:47:51 +03:00
Artur Beljajev
096035ae11 Revert old behaviour 2018-08-08 22:28:09 +03:00
Maciej Szlosarczyk
abb1ad60e8
Update failing test 2018-08-07 15:09:18 +03:00
Maciej Szlosarczyk
0798001725
Make returned API errors more consistent 2018-08-07 15:04:37 +03:00
Maciej Szlosarczyk
de9b1517b0
Merge branch 'registry-918' into registrant-api-contacts-controller 2018-08-07 14:57:58 +03:00
Maciej Szlosarczyk
e3807f694d
Merge branch 'registry-918' into registry-922 2018-08-07 14:54:16 +03:00
Maciej Szlosarczyk
ad8dfcc28f
Make authentication errors more consistent with other errors 2018-08-07 14:52:33 +03:00
Artur Beljajev
39cc31ff7b Remove unused view 2018-08-01 22:13:55 +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
Maciej Szlosarczyk
c476680a91
Add pagination to index 2018-07-31 15:14:21 +03:00
Maciej Szlosarczyk
10d42a0d74
Add domain index action (without pagination yet) 2018-07-30 15:09:48 +03:00
Maciej Szlosarczyk
c1ea79615f
Make API return errors array 2018-07-30 11:07:44 +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