Commit graph

1469 commits

Author SHA1 Message Date
Stas
574f005e08 Merge branch '113911147-whois_update_for_cron' into staging
* 113911147-whois_update_for_cron:
  113911147-whois_update
2016-02-21 17:52:46 +02:00
Stas
2f32585eb5 113911147-whois_update 2016-02-21 17:45:14 +02:00
Timo Võhmar
a218a0b5f2 Merge pull request #87 from internetee/110395650-domain_crons
110395650 domain crons
2016-02-18 20:09:56 +02:00
Stas
0c63f0fa54 Merge branch '111864739-history_legal_doc' into staging
* 111864739-history_legal_doc:
  111864739-contact_and_domain_create
2016-02-17 18:40:32 +02:00
Stas
e60a6ae647 Merge branch '105842700-registrants_portal' into staging
* 105842700-registrants_portal:
  105842700-related_commit_for_113525877
2016-02-17 17:54:07 +02:00
Stas
9df7e7cb9c 105842700-related_commit_for_113525877 2016-02-17 17:48:55 +02:00
Stas
6ebcaf69d0 111864739-contact_and_domain_create 2016-02-15 17:52:30 +02:00
Stas
e5510ac81c Merge branch '109818884-server-hold-sets-force_delete_at' into staging 2016-02-15 15:42:47 +02:00
Stas
8013701580 109818884-rule_added_to_others 2016-02-15 15:42:12 +02:00
Stas
5a9f4125ef Merge branch '105842700-registrants_portal' into staging 2016-02-15 12:38:49 +02:00
Stas
e077ba7ee8 105842700-contact_and_domain_query_change 2016-02-15 12:38:05 +02:00
Vladimir Krylov
5a122bc4f4 Merge branch 'story/105852786-directo' into staging 2016-02-15 12:33:21 +02:00
Vladimir Krylov
e963484277 Story#105852786 - we should use when cancelled_at is nil 2016-02-15 12:33:01 +02:00
Vladimir Krylov
fc76a44f69 Merge branch 'story/113066359-optimization' into staging 2016-02-15 11:48:34 +02:00
Vladimir Krylov
80e0097c4e Merge branch 'story/110392672-domains-async' into story/113066359-optimization
# Conflicts:
#	app/jobs/regenerate_registrar_whoises_job.rb
#	app/jobs/regenerate_whois_record_job.rb
2016-02-15 11:44:43 +02:00
Vladimir Krylov
53006cb4e9 Merge branch 'story/110392672-domains-async' into story/113066359-optimization
# Conflicts:
#	app/jobs/regenerate_registrar_whoises_job.rb
#	app/jobs/regenerate_whois_record_job.rb
2016-02-15 11:43:40 +02:00
Vladimir Krylov
90cca15032 Merge branch 'story/110392672-domains-async' into staging
# Conflicts:
#	app/models/contact.rb
2016-02-15 10:59:00 +02:00
Vladimir Krylov
769e3f1a1f Story#110392672 - do not run RegenerateWhoisRecordJob on empty domains 2016-02-15 10:55:47 +02:00
Vladimir Krylov
dd421f633b Merge remote-tracking branch 'origin/master' into story/110392672-domains-async 2016-02-15 10:44:46 +02:00
Stas
aa0a25a609 Merge branch '110412166-registrant_change' into staging 2016-02-12 14:09:12 +02:00
Vladimir Krylov
af28b9e3f2 Merge branch 'story/113066359-optimization' into staging
# Conflicts:
#	app/jobs/regenerate_registrar_whoises_job.rb
#	app/jobs/regenerate_whois_record_job.rb
#	app/models/blocked_domain.rb
2016-02-11 12:26:58 +02:00
Vladimir Krylov
78ffe33dfa Story#113066359 - extract reserved domains regen password from domain to reserved domain 2016-02-11 12:17:11 +02:00
Vladimir Krylov
77da9ccd2b Story#113066359 - all whois generation of domain and reserved/blocked domain is async + domain destroy removes whois async 2016-02-11 12:04:16 +02:00
Vladimir Krylov
93d765dea2 Story#113066359 - all whois generation of domain and reserved/blocked domain is async + domain destroy removes whois async 2016-02-11 11:48:19 +02:00
Stas
fea6f046e6 Merge branch '108869472-objects_archive' into staging 2016-02-10 17:46:19 +02:00
Timo Võhmar
bd4477f962 Merge pull request #83 from internetee/111396946-blocked_and_reserved_view
111396946 blocked and reserved view
2016-02-10 17:20:55 +02:00
Timo Võhmar
ca62bfaed5 Merge pull request #84 from internetee/story/112050051-incvoice-sort
Story/112050051 incvoice sort
2016-02-10 15:57:37 +02:00
Vladimir Krylov
fd9fca741a Merge remote-tracking branch 'origin/master' into 111396946-blocked_and_reserved_view2
# Conflicts:
#	app/controllers/admin/blocked_domains_controller.rb
#	app/models/blocked_domain.rb
2016-02-10 11:10:49 +02:00
Stas
c3d76ab13f 110412166-validation_for_registrant_change 2016-02-08 16:36:54 +02:00
Vladimir Krylov
4bd3a4f3ff Merge branch 'story/112050051-incvoice-sort' into staging 2016-02-08 10:36:47 +02:00
Vladimir Krylov
db6f78ede4 Story#112050051 - extend ransack to sort invoices by custom scopes 2016-02-08 10:36:22 +02:00
Stas
4f83d5c720 Merge branch '109818884-server-hold-sets-force_delete_at' into staging 2016-02-05 15:46:26 +02:00
Stas
d5f4edbade 109818884-plus_15_days_added 2016-02-05 15:38:53 +02:00
Stas
a18df56c18 Merge branch '111864739-history_legal_doc' into staging 2016-02-05 13:00:14 +02:00
Vladimir Krylov
a13463a36f Merge branch 'story/112993395-reserved-password' into staging 2016-02-04 17:54:17 +02:00
Vladimir Krylov
6984bb9bae Story#112993395 - in reserved domains we are using columns, not hash 2016-02-04 17:53:54 +02:00
Stas
59f7f364ad 11186739-revert_to_2430bfebf2f5ed3471e88f0b8ed2597b603c96e6 2016-02-04 16:32:30 +02:00
Stas
3178c13fd4 Merge branch '111396946-blocked_and_reserved_view' into staging 2016-02-03 17:21:03 +02:00
Stas
f31db65d2c 111396946-validates 2016-02-03 17:17:38 +02:00
Stas
2ab5d8500a 111396946-views_methods 2016-02-03 15:55:39 +02:00
Vladimir Krylov
0de322f634 Merge branch 'story/112965483-skip-blocked-domains' into staging 2016-02-03 12:20:54 +02:00
Vladimir Krylov
54c86e15a3 Story#112965483 - we need to return from method, no iteration here 2016-02-03 12:20:42 +02:00
Vladimir Krylov
d5eebc5b09 Merge branch 'story/112965483-skip-blocked-domains' into staging 2016-02-03 11:35:36 +02:00
Vladimir Krylov
2fea2975f6 Story#112965483 - skip removing whoises for reserved and blocked domains if domain exists 2016-02-03 11:35:26 +02:00
Vladimir Krylov
95ccc81092 Merge branch 'staging' of github.com:internetee/registry into staging 2016-02-03 11:27:17 +02:00
Vladimir Krylov
1fdc8ed023 Merge branch 'story/112965483-skip-blocked-domains' into staging 2016-02-03 11:27:10 +02:00
Vladimir Krylov
3e929a895c Story#112965483 - skip generating whoises for reserved and blocked domains if domain exists 2016-02-03 11:26:55 +02:00
Stas
9cb7a2e39c Merge branch '111864739-history_legal_doc' into staging 2016-02-02 16:38:52 +02:00
Stas
0141026408 111864739-nested_id_catch 2016-02-02 16:38:16 +02:00
Vladimir Krylov
0fa207b71e Merge branch 'story/105852786-directo' into staging 2016-02-02 13:37:35 +02:00