2147 commits

Author	SHA1	Message	Date
Stas	5a97503c17	Merge branch '106012880-pricelists' into staging	2015-11-09 16:18:20 +02:00
Stas	617292c5ef	106012880-query fix	2015-11-09 16:17:52 +02:00
Stas	ab25bdb36d	Merge branch '107058100-legaldoc' into staging	2015-11-06 14:03:35 +02:00
Stas	a9204b8e22	105747240-document log added	2015-11-06 14:03:04 +02:00
Stas	7c769783f6	Merge branch '106012880-pricelists' into staging	2015-11-06 13:58:51 +02:00
Stas	1793f8fd4c	106012880-logic changeges	2015-11-06 13:58:18 +02:00
Stas	7af817104d	Merge branch '106012880-pricelists' into staging	2015-11-06 12:52:22 +02:00
Stas	4203e4a6f4	104989420-validation logic changes	2015-11-06 12:50:18 +02:00
Vladimir Krylov	a7d7304664	Merge branch 'story/105314040-show-all-contact-domains' into staging	2015-11-06 11:58:41 +02:00
Vladimir Krylov	484a3034b1	Story#105314040 show contact domains under statuses in admin	2015-11-06 11:58:08 +02:00
Vladimir Krylov	e8aa4bff32	Story#105302144 show domains under contact in registrar portal	2015-11-06 11:57:06 +02:00
Matt Farnsworth	8050059ad2	Story #104525314 - clean up, remove redundant logic, simplfy	2015-11-06 11:18:06 +02:00
Matt Farnsworth	ea230e70ca	Story #104525314 - clean up, remove dev hacks, allow dev to verify end user experience	2015-11-06 11:16:00 +02:00
Matt Farnsworth	3d7f8e2866	Story #104525314 - fix:admin could not confirm reject pending, refactor registrant confirm	2015-11-06 11:15:05 +02:00
Matt Farnsworth	95bf081b53	Story #104525314 - feature reject combination of delete with deleteProhibited	2015-11-06 11:09:37 +02:00
Matt Farnsworth	c40a282a63	Story #104525314 - change button text to accept/reject delete	2015-11-06 09:30:05 +02:00
Matt Farnsworth	98e27f94d5	Story #104525314 - fix -- should not show apply/delete pending for new status values	2015-11-05 18:32:04 +02:00
Stas	b50f954aa8	Domain pricelist validation	2015-11-05 18:21:20 +02:00
Matt Farnsworth	c0cf697938	Story #104525314 - feature: admin can accept/reject pendingDelete{Confirmation} pending_json is not required	2015-11-05 16:57:24 +02:00
Matt Farnsworth	d72b3518b2	Merge branch '104525314-domain-object-states' into staging to apply bug fixes	2015-11-05 13:12:08 +02:00
Matt Farnsworth	68a93a33ab	Story #104525314 - fix xpath, verified must be found on child delete/delete	2015-11-05 13:08:53 +02:00
Matt Farnsworth	eda586d8c4	Story #104525314 - restore missing change, admin controller flag skips validation	2015-11-05 12:20:25 +02:00
Vladimir Krylov	ee3a601109	Merge branch 'story/105314040-show-all-contact-domains' into staging	2015-11-04 17:01:20 +02:00
Vladimir Krylov	ae5e5abfbc	Story#105314040 filter domains under contacts	2015-11-04 17:00:52 +02:00
Stas	4b4d409423	Merge branch '105046446-users_import' into staging	2015-11-04 16:53:55 +02:00
Stas	e945bcf1f1	Multiple users	2015-11-04 16:51:43 +02:00
Vladimir Krylov	26b0ca7cdd	Story#105314040 add sorting to contact domains (remove debug)	2015-11-04 16:24:13 +02:00
Vladimir Krylov	5dc550172d	add sorting to contact domains	2015-11-04 16:23:01 +02:00
Vladimir Krylov	50983cd95d	add roles to domans list	2015-11-04 15:28:46 +02:00
Vladimir Krylov	af4e609a6d	Story#105314040 In admin contacts show all domains. Roles are missing	2015-11-04 13:45:10 +02:00
Matt Farnsworth	2c717d247a	Story #104525314 - fix typo, wrong braces	2015-11-04 11:28:55 +02:00
Matt Farnsworth	c2ced9a7e7	Merge branch '104525314-domain-object-states' into staging, fix typo	2015-10-30 19:53:13 +02:00
Matt Farnsworth	0cc28d86cf	Story #104525314 - fix typo, add instance of domain ref	2015-10-30 19:52:37 +02:00
Matt Farnsworth	47f41a0bd2	Merge branch '104525314-domain-object-states' into staging	2015-10-30 19:38:39 +02:00
Matt Farnsworth	6f162e3f77	Story #104525314 - set pendingDeleteConfirmation when verifed not yes and confirmation required	2015-10-30 19:37:19 +02:00
Matt Farnsworth	c55695d328	Story #104525314 - remove pendingDeleteConfirmation when expired	2015-10-30 19:18:59 +02:00
Matt Farnsworth	08b9d0251f	Story #104525314 - remove pendingDeleteConfirmation when declined or also go to pendingDelete when confirmed	2015-10-30 19:10:10 +02:00
Matt Farnsworth	a9c805f2ce	Story #104525314 - in some cases treat pendingDeleteConfirmation as pendingDelete no(renew, update, tranfer) pending allowed"	2015-10-30 18:35:45 +02:00
Stas	168efc98fa	Merge branch '105046446-users_import' into staging	2015-10-30 18:10:58 +02:00
Matt Farnsworth	2104cf2f0a	Story #104525314 - refactor : simplify, remove flag controlled path complexity	2015-10-30 17:46:32 +02:00
Stas	3052b98f07	Merge branch 'task#104941754' into staging	2015-10-30 17:25:14 +02:00
Stas	0d251a1a40	104941754-dns_nameservers_update	2015-10-30 17:24:04 +02:00
Matt Farnsworth	853e7b3a1c	Merge: resolve merge conflict	2015-10-30 16:48:23 +02:00
Matt Farnsworth	45588dc72a	MERGE: merged staging at 3235647, resolved merge conflict	2015-10-30 16:12:20 +02:00
Matt Farnsworth	8546eb2449	Story: #104525314 - add pendingDeleteConfirmation as a non-deletable status	2015-10-30 14:18:15 +02:00
Vladimir Krylov	3235647515	Merge branch 'task#104941754' into staging	2015-10-30 14:02:02 +02:00
Vladimir Krylov	1b6badf699	Story#104941754 Fix relation of legacy Nsset	2015-10-30 14:01:02 +02:00
Stas	66d7d80bcc	User import added	2015-10-30 13:56:15 +02:00
Vladimir Krylov	821e864bc3	Merge branch 'task#104941754' into staging ... # Conflicts: # lib/tasks/import.rake	2015-10-30 12:42:51 +02:00
Vladimir Krylov	f2d9203ee3	Story#104941754 Nsset after import take updated_at and created_at.	2015-10-30 12:33:06 +02:00