Commit graph

1303 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
211f8c9143 Fix home page link 2018-08-22 00:21:12 +03:00
Artur Beljajev
ffd389790c Merge branch 'master' into registry-791 2018-08-21 12:08:45 +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
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
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
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
39cc31ff7b Remove unused view 2018-08-01 22:13:55 +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
Artur Beljajev
abe3df24e2 Extract translations 2018-07-19 21:57:27 +03:00
Artur Beljajev
b9d431427a Convert HAML to ERB 2018-07-19 21:52:02 +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
2374d94714 Remove unneeded condition 2018-07-19 00:24:10 +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
Artur Beljajev
84bf967780 Fix template 2018-07-15 19:01:33 +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
278522cfc3
Revert to old flash behavior 2018-06-26 15:52:46 +03:00
Maciej Szlosarczyk
3c44472ea8
Revert flash_messages to shared/flash 2018-06-26 15:44:34 +03:00
Artur Beljajev
f8290f90c5 Merge branch 'master' into registry-791 2018-06-20 12:34:26 +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
febbe1282d Fix links 2018-06-19 21:02:56 +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
7ee0f18a46 Merge branch 'master' into improve-registrant-area 2018-06-18 14:58:15 +03:00
Artur Beljajev
80de7dd4ed Improve UI 2018-06-18 13:50:39 +03:00
Artur Beljajev
457c142f61 Extract partial 2018-06-18 13:45:03 +03:00
Artur Beljajev
4e2d32a6ce Unify contact.auth_info look and feel 2018-06-18 13:30:57 +03:00
Artur Beljajev
8023742964 Use the named route helpers 2018-06-18 12:26:41 +03:00
Artur Beljajev
d403fdb5af Remove useless data from UI 2018-06-18 12:05:01 +03:00
Artur Beljajev
36b95973c8 Use standard datetime format 2018-06-18 12:03:59 +03:00
Maciej Szlosarczyk
4e181c51ca
Move from 2 to 4 spaces indentation in registrant/application.html.erb 2018-06-18 10:31:29 +03:00
Maciej Szlosarczyk
843dc8edcb
Add new links to registrant page layout 2018-06-18 10:30:23 +03:00
Artur Beljajev
7792a78f22 Improve readability 2018-06-18 01:25:18 +03:00
Artur Beljajev
ca09833bb7 Remove dead code
`Contact#statuses` is never validated
2018-06-18 01:20:55 +03:00
Artur Beljajev
452caffc7d Improve UI 2018-06-18 00:49:35 +03:00
Artur Beljajev
82cef0401a Remove unneeded condition
Contact's registrar is always present
2018-06-18 00:08:59 +03:00