1738 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
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	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
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	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
Vladimir Krylov	da7ce59f2e	Story#104941754 DomainContacts and DnsKey after import take updated_at and created_at.	2015-10-30 11:48:28 +02:00
Vladimir Krylov	11e8701458	Merge branch 'story/104711124-statuses' into staging	2015-10-29 16:52:16 +02:00
Vladimir Krylov	e92f21dee4	Story#104711124 update domains state names + it has influenced to change forceDelete to serverForceDelete	2015-10-29 16:51:06 +02:00
Vladimir Krylov	d2b5266887	in the migration script add state to the Contact	2015-10-29 15:22:03 +02:00
Matt Farnsworth	3a16b9eada	Story: #104525314 - fix: do not ask registrant verification when there were errors and nothing is done	2015-10-29 13:09:20 +02:00
Vladimir Krylov	8172a308ca	Merge branch 'story/105997358-renew-domain' into staging	2015-10-29 12:55:24 +02:00
Vladimir Krylov	c7cd394214	Story#105997358 added more states which prohibit domain to be renewed + simplier days calculation	2015-10-29 12:51:37 +02:00
Vladimir Krylov	e9294b4a58	Merge remote-tracking branch 'origin/story/106092900-uncomment-admin-select-list' into staging	2015-10-29 10:50:03 +02:00
Vladimir Krylov	ad3381bf60	Story#106092900 allowing admin to select more states	2015-10-28 21:11:47 +02:00
Vladimir Krylov	16933d9590	Merge branch 'story/105418634-generate-record' into staging	2015-10-28 20:53:50 +02:00
Vladimir Krylov	fdd2b6809e	Story#105418634 rubymine memory problem	2015-10-28 20:53:27 +02:00
Vladimir Krylov	a325db2bb9	Merge branch 'story/105418634-generate-record' into staging	2015-10-28 20:48:06 +02:00
Vladimir Krylov	6ae65a8b42	Story#105418634 revert	2015-10-28 20:46:16 +02:00
Vladimir Krylov	bfcf5a2a0f	Story#105418634 Update Whois body(whois is using stringified json)	2015-10-28 20:45:49 +02:00
Vladimir Krylov	c7515922c3	Merge branch 'story/105418634-generate-record' into staging	2015-10-28 20:11:18 +02:00