Commit graph

1531 commits

Author SHA1 Message Date
Artur Beljajev
762833726a Remove duplicate field 2018-09-17 22:02:11 +03:00
Artur Beljajev
1679e4b72e Merge branch 'master' into refactor-messages
# Conflicts:
#	app/views/epp/poll/poll_req.xml.builder
#	test/fixtures/messages.yml
#	test/integration/epp/poll_test.rb
2018-09-17 13:23:59 +03:00
Timo Võhmar
4bf24d8ba7
Merge pull request #949 from internetee/registry-948
Return UTC date in EPP poll response
2018-09-17 11:58:04 +03:00
Artur Beljajev
056c57530c Merge branch 'master' into refactor-messages
# Conflicts:
#	db/structure.sql
2018-09-01 19:40:13 +03:00
Artur Beljajev
3ca95364ef Merge branch 'master' into improve-registrant-area
# Conflicts:
#	test/fixtures/contacts.yml
2018-09-01 19:37:44 +03:00
Maciej Szlosarczyk
2636fe2525
Merge branch 'master' into registry-927 2018-08-31 14:25:59 +03:00
Artur Beljajev
aff5b68a2f Merge branch 'master' into refactor-messages
# Conflicts:
#	db/structure.sql
2018-08-28 14:28:45 +03:00
Artur Beljajev
c1e60f663e Merge branch 'master' into improve-registrant-area 2018-08-27 21:51:10 +03:00
Artur Beljajev
1bfdf899a0 Merge branch 'master' into refactor-messages
# Conflicts:
#	db/structure.sql
2018-08-27 20:55:44 +03:00
Artur Beljajev
69027abc9f Remove unused view 2018-08-27 16:39:14 +03:00
Artur Beljajev
3d51a93f95 Merge branch 'master' into registry-790 2018-08-27 15:24:05 +03:00
Maciej Szlosarczyk
1684c5dd34
Merge branch 'master' into registry-927 2018-08-27 12:35:35 +03:00
Artur Beljajev
d27443277f Merge branch 'master' into improve-registrant-area 2018-08-27 12:23:09 +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
Maciej Szlosarczyk
8aa8aea24e
Merge branch 'master' into registry-927 2018-08-27 11:40:28 +03:00
Artur Beljajev
7368d1d756 Return UTC date in EPP poll response
Closes #948
2018-08-27 01:45:53 +03:00
Artur Beljajev
1f78856ea9 Merge branch 'master' into refactor-devise-integration 2018-08-25 17:29:00 +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
7a9a7c052f Rename notifications.queued to read 2018-08-24 10:29:09 +03:00
Artur Beljajev
dfff6f6d12 Rename notifications.body to text 2018-08-23 22:33:30 +03:00
Artur Beljajev
8765baf319 Rename Message to Notification 2018-08-23 20:03:03 +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
8f0f23606c Remove unused and buggy code 2018-08-17 22:23:54 +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
ca5edb16fa Refactor contact list 2018-08-15 12:56:56 +03:00
Artur Beljajev
638167e3cb Improve registrant area 2018-08-11 18:10:08 +03:00
Maciej Szlosarczyk
d26f073e1f
Revert indentation change 2018-08-10 14:22:50 +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
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
Artur Beljajev
1ff200576e Extract translations 2018-08-09 14:43:10 +03:00
Maciej Szlosarczyk
faeeb55bc7
Add badges to locked domains 2018-08-09 13:57:31 +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
Maciej Szlosarczyk
dffe865d89
Add ability for admin to remove registry lock 2018-08-08 15:43:29 +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
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
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