Commit graph

3334 commits

Author SHA1 Message Date
Matt Farnsworth
107448d919 Revert "Story #104525314 - admin is not allowed to reject pendingDeleteConfirmation"
user actually does want this feature

This reverts commit b5c3a24bde.
2015-11-23 09:14:49 +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
3672e31e56 resolve merge conflict from upstream confict, empty commit 2015-11-19 16:41:00 +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
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
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
Timo Võhmar
360fb57a68 Merge pull request #5 from internetee/staging
Staging
2015-11-17 14:58:28 +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
Stas
18517fd10c 107997032-whois_domain_delete 2015-11-17 13:14:16 +02:00
Stas
5ee8aed271 Merge branch '108078584-domains_import_changes' into staging 2015-11-17 12:47:28 +02:00
Stas
72a6394f57 108078584-import_conditions_change 2015-11-17 12:46:01 +02:00
Matt Farnsworth
c0960e9184 Story #105839906 -- drop Version and log_legal_documents from legal_documents 2015-11-17 12:09:16 +02:00
Vladimir Krylov
d471cb46db Merge branch '106735814-legal-documents-not-in-log-tables' into staging 2015-11-16 17:15:41 +02:00
Vladimir Krylov
b05ce36ea3 Story#105747240 - remove legal documents from domain history 2015-11-16 17:13:55 +02:00
Vladimir Krylov
a6027ac7d6 Merge remote-tracking branch 'origin/107058100-legaldoc' into 106735814-legal-documents-not-in-log-tables 2015-11-16 17:07:47 +02:00
Vladimir Krylov
111fc8a8c3 Merge branch 'story/107571572-seb' into staging 2015-11-16 11:14:11 +02:00
Vladimir Krylov
fc5dbd3523 Story#107571572 - banklinks workflow fixes 2015-11-16 10:59:26 +02:00
Stas
af6f63f0a1 Merge branch '105046446-users_import' into staging 2015-11-13 19:49:34 +02:00
Stas
8b7b8182ca User import changes 2015-11-13 19:48:46 +02:00
Stas
b046b51d1f Merge branch '105361584-contact_view' into staging 2015-11-13 17:14:55 +02:00
Stas
8954db689c logic fix 2015-11-13 17:14:31 +02:00
Stas
27955690d6 Merge branch '105361584-contact_view' into staging 2015-11-13 16:41:42 +02:00
Stas
5ae8732b41 105361584-ident changes 2015-11-13 16:40:54 +02:00
Stas
3ab0a49ec5 Merge branch '105361584-contact_view' into staging 2015-11-13 16:21:09 +02:00
Stas
78e4016d3d 105361584-no access for ident and pass 2015-11-13 16:20:45 +02:00
Stas
fcf30768d3 Merge branch '105361584-contact_view' into staging 2015-11-13 15:58:11 +02:00
Stas
4623031060 105361584-no acces for country 2015-11-13 15:57:45 +02:00
Stas
f455438aea Merge branch '105361584-contact_view' into staging 2015-11-13 15:50:27 +02:00
Stas
2803a84815 105361584-no access added 2015-11-13 15:49:13 +02:00
Vladimir Krylov
bb4440b19e Merge branch '107279016-reserved_domains' into staging 2015-11-13 15:21:36 +02:00