Commit graph

4671 commits

Author SHA1 Message Date
Stas
bf52d8f2b8 Merge branch '120093749-no_access_bug' into staging 2016-06-20 18:04:13 +03:00
Stas
6382d56266 120093749-no_access_fix 2016-06-20 18:03:34 +03:00
Stas
50830b2a09 Merge branch '115693873-whodunnit_empty' into staging 2016-06-16 16:36:16 +03:00
Stas
e13b225728 Merge branch '118007975-dns_management' into staging 2016-06-16 15:37:08 +03:00
Stas
a35cee90c3 118007975-old_algorithm_fix 2016-06-16 15:36:44 +03:00
Stas
74f0633c09 Merge branch '118007975-dns_management' into staging 2016-06-16 13:26:34 +03:00
Stas
71b144280d 118007975-index_check 2016-06-16 13:26:13 +03:00
Stas
9876bfdae8 Merge branch '118007975-dns_management' into staging 2016-06-16 13:10:37 +03:00
Stas
fd79a442cc 118007975-whitespaces 2016-06-16 13:10:15 +03:00
Stas
3f34b7f3ee Merge branch '118007975-dns_management' into staging 2016-06-16 12:34:48 +03:00
Stas
2a4a8497ea 118007975-html_fixes 2016-06-16 12:33:58 +03:00
Timo Võhmar
d6e490d402 Update CHANGELOG.md 2016-06-16 11:12:34 +03:00
Timo Võhmar
e2dbc91e82 Merge pull request #150 from internetee/story/121580929-empty-nokogiri
Story#121580929 fix when incoming frame is empty
2016-06-16 10:58:24 +03:00
Timo Võhmar
739b817321 Merge pull request #151 from internetee/story/120095555-ipv6-hostname
Story/120095555 ipv6 hostname
2016-06-16 10:57:50 +03:00
Stas
abf736e540 115693873-initiator_catches 2016-06-15 18:27:28 +03:00
Vladimir Krylov
3c71c0a06d Merge branch 'story/121580929-empty-nokogiri' into staging
# Conflicts:
#	lib/epp_constraint.rb
2016-06-15 17:29:37 +03:00
Vladimir Krylov
371ec46f42 Story#121580929 fix when incoming frame is empty 2016-06-15 17:28:49 +03:00
Vladimir Krylov
bd46a21623 Merge branch 'story/120095555-ipv6-hostname' into staging 2016-06-15 11:37:14 +03:00
Vladimir Krylov
67e32f3a36 better error on validating glue IP address 2016-06-15 11:36:57 +03:00
Timo Võhmar
37952d22ed Update CHANGELOG.md 2016-06-15 10:44:41 +03:00
Timo Võhmar
002fbf5107 Update CHANGELOG.md
changes deployed to production on 14.06.2016
2016-06-14 15:31:26 +03:00
Timo Võhmar
6ac9cd628b Merge pull request #149 from internetee/120828283-fix_for_empty_hello
120828283-fix_for_empty_hello
2016-06-14 14:05:19 +03:00
Stas
a3f903b717 120828283-fix_for_empty_hello
(cherry picked from commit e6710e5)
2016-06-14 12:42:21 +03:00
Vladimir Krylov
90778863ae Merge branch 'story/120095555-ipv6-hostname' into staging 2016-06-13 13:17:21 +03:00
Vladimir Krylov
999c161c8e Story#120095555 - glue nameserver may have IPv4 or IPv6 2016-06-13 13:17:01 +03:00
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