Commit graph

1586 commits

Author SHA1 Message Date
Vladimir Krylov
a54fbe906e Merge branch '111864739-history_legal_doc' into staging 2016-02-25 17:02:10 +02:00
Vladimir Krylov
30fe6bd1e6 Story#114471339 - move parse_legal_document_from_frame to one braking point 2016-02-25 17:01:41 +02:00
Vladimir Krylov
a4a6f7068f Merge branch 'story/105852786-directo' into staging 2016-02-25 16:26:05 +02:00
Vladimir Krylov
55ffd229f9 Story#112043941 - show in cron STDOUT log that Directo task has been finished 2016-02-25 16:25:43 +02:00
Vladimir Krylov
55722d98f9 Merge branch '111864739-history_legal_doc' into staging 2016-02-25 14:21:30 +02:00
Vladimir Krylov
7a659da6a3 Story#114471339 - change order when legal docs are saved into DB 2016-02-25 14:20:19 +02:00
Stas
577762a2bc 110687814-migrations_and_values 2016-02-25 13:54:46 +02:00
Vladimir Krylov
e45915b9da Story#105855968 - 1st scratch how to send monthly invoices 2016-02-25 13:34:52 +02:00
Stas
653b97a867 113524121-round_for_expression 2016-02-25 12:23:20 +02:00
Timo Võhmar
e016ec4767 Merge pull request #89 from internetee/story/110392672-domains-async
Story/110392672 domains async
2016-02-25 11:17:25 +02:00
Stas
010dc17dd6 113524121-min_size_changed 2016-02-22 16:01:56 +02:00
Vladimir Krylov
e8bf3f7e64 Story#105855968 - Shorter code on pricelist type calculation 2016-02-22 14:22:53 +02:00
Vladimir Krylov
83a908760d resolve conflict 2016-02-22 11:07:54 +02:00
Timo Võhmar
5da7a7a7d0 Merge pull request #88 from internetee/story/105852786-directo
29Story/105852786 directo
2016-02-22 01:06:12 +02:00
Stas
b6742c0c09 113524121-check_minimum_size 2016-02-21 20:43:43 +02:00
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
Vladimir Krylov
afd3b06f62 Merge remote-tracking branch 'origin/master' into 105846070-merge-with-105842700-arireg-for-registrant-port
# Conflicts:
#	app/models/domain.rb
2016-02-15 10:11:07 +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
185e1d5c93 110687814-update_function 2016-02-10 10:38:47 +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