Commit graph

4696 commits

Author SHA1 Message Date
teadur
ad823391b7 Merge pull request #147 from internetee/nokogiri-master
nokogiri security update
2016-06-10 14:30:13 +03:00
Georg Kahest
798db4d1d5 nokogiri security update 2016-06-10 14:29:23 +03:00
Vladimir Krylov
94f34d7095 Merge branch '115693873-whodunnit_empty' into staging 2016-06-10 14:22:05 +03:00
Vladimir Krylov
b03e6c01ac Story#115693873 - Job's initiator may be nil for migration period 2016-06-10 14:21:46 +03:00
Vladimir Krylov
4bbebe8ad6 Merge branch '108869472-objects_archive' into staging
# Conflicts:
#	app/views/admin/domain_versions/show.haml
2016-06-10 14:09:52 +03:00
Vladimir Krylov
4a2bbdda7b Strory#108869472 - get deleted registrars by history 2016-06-10 14:08:13 +03:00
Vladimir Krylov
f49ee67e83 Strory#108869472 - merge master 2016-06-10 13:39:36 +03:00
teadur
4e6f9fa826 Merge pull request #146 from internetee/nokogiri-staging
nokogiri security update
2016-06-08 18:06:48 +03:00
Georg Kahest
f87ef07163 nokogiri security update 2016-06-08 18:03:57 +03:00
Timo Võhmar
7fc4558bf5 Merge pull request #145 from internetee/story/118912395-epp-log
Story/118912395 epp log
2016-06-08 14:03:10 +03:00
Stas
7711519538 Merge branch '115693873-whodunnit_empty' into staging 2016-06-07 16:38:34 +03:00
Stas
2f9a9bd680 115693873-job-initiator_added 2016-06-07 16:02:17 +03:00
Timo Võhmar
b161cfd40c Merge pull request #144 from internetee/111601356-ident_type_validation
111601356 ident type validation
2016-06-07 15:11:44 +03:00
Timo Võhmar
57f8efdf69 Merge pull request #143 from internetee/story/120182999-registrant-notify
Story#120182999 -  Registrant: message to login screen about Estonian…
2016-06-07 13:12:21 +03:00
Vladimir Krylov
53df43e737 Merge branch 'story/120182999-registrant-notify' into staging
# Conflicts:
#	config/locales/en.yml
2016-06-06 13:06:34 +03:00
Vladimir Krylov
d1f14e697e Story#120182999 - Registrant: message to login screen about Estonian ID requirement. 2016-06-06 13:05:49 +03:00
Vladimir Krylov
0e214db7d3 Merge branch 'story/118912395-epp-log' into staging 2016-06-06 12:32:44 +03:00
Vladimir Krylov
a516f38bae Story#118912395 - save request_object_cont data 2016-06-06 12:31:21 +03:00
Stas
01de0343d2 Merge branch '118007975-dns_management' into staging 2016-06-06 09:26:57 +03:00
Timo Võhmar
67db21cb47 Merge pull request #142 from internetee/114677695-idn_support
114677695 idn support
2016-06-03 15:50:10 +03:00
Stas
e6710e56db 120828283-fix_for_empty_hello 2016-06-03 14:25:10 +03:00
Stas
90eaf1b6aa Merge branch '108869472-objects_archive' into staging 2016-06-02 15:46:51 +03:00
Stas
e032eafc0b 108869472-template_fix 2016-06-02 15:45:10 +03:00
Stas
b773baffd5 Merge branch '117806281-clickable_actions' into staging 2016-06-02 12:17:49 +03:00
Stas
be10e84b1b 117806281-creator_changes 2016-06-02 12:17:25 +03:00
Vladimir Krylov
1063807528 Merge branch 'story/116761157-contact-dyn-states' into staging 2016-05-31 17:40:16 +03:00
Vladimir Krylov
7ea563790d Story#116761157 - remove statuses uniqueness validation as no need any more 2016-05-31 17:40:00 +03:00
Vladimir Krylov
66e7253dc3 Story#116761157 - remove statuses uniqueness validation as no need any more 2016-05-31 17:39:45 +03:00
Vladimir Krylov
de17f72dc0 Merge branch '108869472-objects_archive' into staging 2016-05-31 08:20:03 +03:00
Vladimir Krylov
00b9d50c08 Story#108869472 - domain history search not failing whenregistrants not found 2016-05-31 08:18:21 +03:00
Stas
c67233e694 118007975-style_changes 2016-05-30 18:01:01 +03:00
Vladimir Krylov
a3570b858e Merge branch 'story/116761157-contact-dyn-states' into staging 2016-05-30 14:46:39 +03:00
Vladimir Krylov
2e98e0f163 Story#116761157 - "ok" state of Contact is not always set and is dynamic 2016-05-30 14:45:57 +03:00
Vladimir Krylov
e9cf8f7900 Story#116761157 - "ok" state of Contact is not always set and is dynamic 2016-05-30 14:45:24 +03:00
Vladimir Krylov
8fc42fe642 Merge branch 'story/118912395-epp-log' into staging 2016-05-30 13:29:25 +03:00
Vladimir Krylov
a1141a5bb4 Story#118912395 - epp:log request object search by include 2016-05-30 13:28:57 +03:00
Vladimir Krylov
6a01c8c7ab Merge branch 'story/116761157-contact-dyn-states' into staging 2016-05-30 12:49:31 +03:00
Vladimir Krylov
d1e5312b98 Story#116761157 - search by linked contacts in dynamic way 2016-05-30 12:49:06 +03:00
Stas
2b69ae3305 Merge branch '114677695-idn_support' into staging 2016-05-27 16:43:50 +03:00
Stas
684b8bf0d9 114677695-error_text_change 2016-05-27 16:43:23 +03:00
Timo Võhmar
7209834d7c Merge branch 'auto_email_notification_fixes' 2016-05-27 16:40:30 +03:00
Timo Võhmar
7bef2c1438 Merge branch 'registrant_login_notification' 2016-05-27 16:40:10 +03:00
Stas
91169bd42f Merge branch '114677695-idn_support' into staging 2016-05-27 16:39:51 +03:00
Stas
49f527ab4d Merge branch '117806281-clickable_actions' into staging 2016-05-27 16:24:22 +03:00
Stas
d179f1c244 117806281-typo 2016-05-27 16:23:46 +03:00
Timo Võhmar
4c22b4a7ee Merge pull request #141 from internetee/story/118300251-registrant
Story/118300251 registrant
2016-05-27 16:21:41 +03:00
Stas
1362438894 Merge branch '117806281-clickable_actions' into staging 2016-05-27 16:17:30 +03:00
Vladimir Krylov
45f478780c Merge branch 'story/116761157-contact-dyn-states' into staging 2016-05-27 15:09:01 +03:00
Vladimir Krylov
34ef156484 Story#116761157 - set contact nil statuses to empty array as default 2016-05-27 15:08:38 +03:00
Vladimir Krylov
223b6b8b9f Merge branch 'story/116761157-contact-dyn-states' into staging 2016-05-27 14:31:39 +03:00