Matt Farnsworth
d78fa578d1
Merge branch '104525314-domain-object-states' into staging
2015-11-20 16:55:11 +02:00
Matt Farnsworth
c644afdaf3
Merge branch '104525314-domain-object-states' of http://github.com/internetee/registry into 104525314-domain-object-states
2015-11-20 16:54:21 +02:00
Matt Farnsworth
b5c3a24bde
Story #104525314 - admin is not allowed to reject pendingDeleteConfirmation
2015-11-20 16:51:28 +02:00
Matt Farnsworth
229f5a34af
Story #104525314 - remove s typo
2015-11-20 16:51:28 +02:00
Matt Farnsworth
b561b8e543
Story #104525314 - allow admin to remove pendingDelete and clear delete_at
2015-11-20 16:47:25 +02:00
Matt Farnsworth
64b0e391a4
Story #104525314 - bug fix, now pendingDeleteConfirmation must transit to pendingDelete, or cancel pending
2015-11-20 16:47:25 +02:00
Matt Farnsworth
a48abe621e
Story #104525314 - clean up, finishes prior commit 9cf287b35c
2015-11-20 16:47:25 +02:00
Matt Farnsworth
9f2bf36b9e
Story #104525314 - remove reject/accept button from pendingDelete, allow only for pending...Confirmation
2015-11-20 16:47:25 +02:00
Matt Farnsworth
08114e722b
Story #104525314 - avoid reporting no errors when error raised
2015-11-20 16:47:25 +02:00
Matt Farnsworth
6140701e47
Story #104525314 - fix missing error message on probibited change admin/tech contact
2015-11-20 16:47:25 +02:00
Matt Farnsworth
2127ec2e48
Merge branch '108518226-Epp-IDNA-support' into staging
2015-11-20 11:34:21 +02:00
Matt Farnsworth
b8de6303f9
Story #108518226 - add index on domain name
2015-11-20 11:22:08 +02:00
Matt Farnsworth
106d3b4109
Merge branch '108518226-Epp-IDNA-support' into staging
2015-11-19 19:12:24 +02:00
Matt Farnsworth
bbc53700bd
Story #108518226 - add IDN lookup method to support info and check features of EPP
2015-11-19 19:11:30 +02:00
Matt Farnsworth
b495fbc8cc
Merge branch '104525314-domain-object-states' into staging
2015-11-19 17:00:31 +02:00
Matt Farnsworth
3672e31e56
resolve merge conflict from upstream confict, empty commit
2015-11-19 16:41:00 +02:00
Vladimir Krylov
d16167c436
Merge branch 'story/107699154-whois-open-email' into staging
2015-11-19 16:31:41 +02:00
Vladimir Krylov
32a3615ad6
Story#107699154 - whois text report typo
2015-11-19 16:31:22 +02:00
Matt Farnsworth
a53451c2ef
Story #104525314 - allow admin to remove pendingDelete and clear delete_at
2015-11-19 16:18:13 +02:00
Matt Farnsworth
b1c8eb5f31
Story #104525314 - bug fix, now pendingDeleteConfirmation must transit to pendingDelete, or cancel pending
2015-11-19 16:18:13 +02:00
Matt Farnsworth
f54ed751bc
Story #104525314 - clean up, finishes prior commit 9cf287b35c
2015-11-19 16:18:13 +02:00
Matt Farnsworth
605e779bc9
Story #104525314 - remove reject/accept button from pendingDelete, allow only for pending...Confirmation
2015-11-19 16:18:13 +02:00
Matt Farnsworth
a3c5dfbd1b
Story #104525314 - avoid reporting no errors when error raised
2015-11-19 16:18:13 +02:00
Matt Farnsworth
b426304e42
Story #104525314 - fix missing error message on probibited change admin/tech contact
2015-11-19 16:18:13 +02:00
Vladimir Krylov
11c4a48d93
Merge branch '105839906-reduce-history-of-db-objects' into staging
2015-11-19 15:06:02 +02:00
Vladimir Krylov
456bbaabde
Story#105839906 - load history objects by id
2015-11-19 15:05:14 +02:00
Vladimir Krylov
cd86bf465a
Merge branch 'story#108423414-registrar-links' into staging
...
# Conflicts:
# app/views/registrar/contacts/show.haml
2015-11-19 13:40:24 +02:00
Vladimir Krylov
c013e9789c
Stroy#108423414 links in contact view's domain list use registrar
2015-11-19 13:39:04 +02:00
Vladimir Krylov
563c6eb023
Merge branch 'story/107699154-whois-open-email' into staging
2015-11-19 12:27:19 +02:00
Vladimir Krylov
b8f1dbbf54
Stroy#107699154 disclosed should have array
2015-11-19 12:27:06 +02:00
Vladimir Krylov
f5478c0dc7
Merge branch 'story/107699154-whois-open-email' into staging
2015-11-19 12:07:58 +02:00
Matt Farnsworth
6c559b8c25
Story #104525314 - allow admin to remove pendingDelete and clear delete_at
2015-11-19 10:19:29 +02:00
Matt Farnsworth
69f0f8af12
Story #104525314 - bug fix, now pendingDeleteConfirmation must transit to pendingDelete, or cancel pending
2015-11-18 12:42:04 +02:00
Vladimir Krylov
9eb4be7d18
merge has removed Gemfile.lock
2015-11-18 10:30:55 +02:00
Matt Farnsworth
df3f91f482
Story #104525314 - clean up, finishes prior commit 9cf287b35c
2015-11-18 10:28:23 +02:00
Matt Farnsworth
5b325882f1
Story #104525314 - remove reject/accept button from pendingDelete, allow only for pending...Confirmation
2015-11-18 10:01:52 +02:00
Matt Farnsworth
afbddad42f
Story #104525314 - avoid reporting no errors when error raised
2015-11-17 17:48:28 +02:00
Matt Farnsworth
9cf287b35c
Story #104525314 - fix missing error message on probibited change admin/tech contact
2015-11-17 17:48:11 +02:00
Stas
e40ddbb134
Merge branch '107821878-emails' into staging
2015-11-17 17:27:08 +02:00
Stas
90ad9ff887
107821878-que_mailer
2015-11-17 16:56:53 +02:00
Stas
2dddace1b8
Merge branch 'staging' of github.com:internetee/registry into staging
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-11-17 16:51:46 +02:00
Stas
d5ebebb567
Merge branch '105361584-contact_view' into staging
2015-11-17 15:23:12 +02:00
Stas
6ca6ff2bf8
105361584-domains_list_hided
2015-11-17 15:22:35 +02:00
Stas
5879cbcf95
Merge branch '107997032-whois-delete' into staging
2015-11-17 15:00:24 +02:00
Timo Võhmar
360fb57a68
Merge pull request #5 from internetee/staging
...
Staging
2015-11-17 14:58:28 +02:00
Stas
3ea53ad016
107997032-whois_db_delete
...
(cherry picked from commit c4dbd4c)
2015-11-17 14:57:17 +02:00
Vladimir Krylov
b93cdc29bf
Merge branch '105839906-reduce-history-of-db-objects' into staging
2015-11-17 14:48:26 +02:00
Vladimir Krylov
01a9ade5c0
Stroy#105839906 domain log saves under children_log only ids, not whole objects
2015-11-17 14:46:21 +02:00
Vladimir Krylov
3f17f728eb
Stroy#105839906 more cleanup to remove legal_documents_versions + some code reading-refactorings
2015-11-17 14:44:10 +02:00
Stas
a07b24856b
Merge branch '107997032-whois_delete' into staging
2015-11-17 13:16:11 +02:00
