103 commits

Author	SHA1	Message	Date
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
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	0c21f9b304	Merge branch '107279016-reserved_domains' into staging	2015-11-13 13:12:28 +02:00
Stas	34363ca878	107279016-condition typo	2015-11-13 13:11:52 +02:00
Stas	06db728f58	Merge branch '107279016-reserved_domains' into staging	2015-11-12 18:22:09 +02:00
Stas	e5b3495f37	107279016-bach size changed	2015-11-12 18:21:47 +02:00
Stas	955a32ae60	Merge branch '107279016-reserved_domains' into staging	2015-11-12 18:17:33 +02:00
Stas	157daa629b	107279016-reserved domains import	2015-11-12 18:16:21 +02:00
Stas	6be6ca5a94	Merge branch '105046446-users_import' into staging	2015-11-11 11:54:26 +02:00
Stas	3724f7abc2	1050446446 identity code added	2015-11-11 11:53:26 +02:00
Stas	d58d16a250	Merge branch '105046446-users_import' into staging	2015-11-09 11:01:19 +02:00
Stas	44948092f9	105046446-interfaces	2015-11-09 11:00:42 +02:00
Stas	58ab72d5d7	Merge branch '105046446-users_import' into staging	2015-11-06 15:38:59 +02:00
Stas	429bbe5926	104989420-interfaces for ip	2015-11-06 15:38:27 +02:00
Stas	eefc5a5b1c	Merge branch '105046446-users_import' into staging	2015-11-06 15:18:53 +02:00
Stas	34a2923b54	104989420-roles changes	2015-11-06 15:18:16 +02:00
Stas	96e599f885	Merge branch '105046446-users_import' into staging	2015-11-05 13:31:39 +02:00
Stas	d6bcfd73f9	Role added	2015-11-05 13:31:09 +02:00
Stas	153971078d	Merge branch '105046446-users_import' into staging	2015-11-05 13:15:54 +02:00
Stas	52daf0ba14	Login changed for idkaart, random password added.	2015-11-05 13:14:43 +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
Stas	168efc98fa	Merge branch '105046446-users_import' into staging	2015-10-30 18:10:58 +02:00
Stas	0feb367aba	Merge branch 'task#104941754' into staging	2015-10-30 18:02:58 +02:00
Stas	7a46731ebb	104941754-default_time_added	2015-10-30 18:01:22 +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
Stas	66d7d80bcc	User import added	2015-10-30 13:56:15 +02:00
Vladimir Krylov	84ea46912b	Merge branch 'task#104941754' into staging ... # Conflicts: # lib/tasks/import.rake	2015-10-30 12:45:33 +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	b87fcb4bba	Story#104941754 Nameservers don't have created_at	2015-10-30 12:39:16 +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
Stas	fde9b4431e	Merge branch '105046446-org_and_name_import' into staging	2015-10-28 12:39:59 +02:00
Stas	93a1633f52	Merge branch '105046446-org_and_name_import' into staging	2015-10-28 12:36:07 +02:00
Stas	3f3ead02fe	updated_at autofill fix	2015-10-28 12:27:29 +02:00
Stas	00859c3298	Contact name change	2015-10-28 11:23:35 +02:00
Stas	1fe19d7b55	updated_at autofill fix	2015-10-27 17:22:22 +02:00
Stas	ebded08bf4	Merge branch 'task#104941754' into staging	2015-10-23 19:43:40 +03:00
Stas	b0cce5f4e7	Update date added	2015-10-23 19:42:55 +03:00
Stas	14b93ee3b4	Merge branch 'task#104941754' into staging	2015-10-22 13:28:25 +03:00
Stas	4ddfe934d6	Merge branch '104945402-notify_email_add' into staging	2015-10-22 12:38:47 +03:00
Stas	5a8132daed	Merge branch '104940548-object_owner_fix' into staging	2015-10-22 12:38:04 +03:00
Stas	a4b8003698	Merge branch '104941314-object_creator_fix' into staging	2015-10-22 12:36:14 +03:00
Stas	418dc465b3	Merge branch 'task#104941754' into staging	2015-10-22 12:34:41 +03:00