Commit graph

459 commits

Author SHA1 Message Date
Vladimir Krylov
66ea1e0fa5 Merge branch 'story/115762063--show-historical-nested' into staging
# Conflicts:
#	app/models/domain.rb
2016-03-24 15:57:03 +02:00
Vladimir Krylov
2b2e2e5254 Story#115762063 - typo 2016-03-24 15:47:07 +02:00
Vladimir Krylov
f69c4ef919 Merge branch 'story/115762063--show-historical-nested' into staging
# Conflicts:
#	app/models/domain.rb
#	app/views/admin/domains/partials/_version.haml
#	config/locales/en.yml
2016-03-23 18:30:34 +02:00
Vladimir Krylov
bcc8e7b6f8 story#115762063 - use special helper method to generate class name 2016-03-23 18:28:40 +02:00
Vladimir Krylov
b73cc424ff Merge branch 'story/115405945-clean_expired_pendings' into staging 2016-03-17 12:49:47 +02:00
Vladimir Krylov
92bc47adfa Story#115405945 - papertrail saves new time as record itself 2016-03-17 12:49:00 +02:00
Vladimir Krylov
4b03d843c9 Merge branch 'story/115405945-clean_expired_pendings' into staging 2016-03-15 15:20:40 +02:00
Vladimir Krylov
d703cac62d Story#115405945 - on remove pending state create update history record 2016-03-15 15:20:08 +02:00
Vladimir Krylov
ec03169bb6 Merge branch 'story/115405945-clean_expired_pendings' into staging 2016-03-14 17:58:41 +02:00
Vladimir Krylov
03b58f7386 Story#115405945 - clean_pendings_lowlevel saves history 2016-03-14 17:56:31 +02:00
Vladimir Krylov
7d8cc9839f Merge branch 'story/105855968-directo' into staging
# Conflicts:
#	Gemfile
#	Gemfile.lock
2016-03-11 11:26:14 +02:00
Timo Võhmar
30697a3b6d Merge pull request #101 from internetee/story/113066359-optimization
Story/113066359 optimization
2016-03-10 13:22:54 +02:00
Vladimir Krylov
b76fb8c9ff Merge remote-tracking branch 'origin/master' into story/105855968-directo 2016-03-04 14:34:40 +02:00
Vladimir Krylov
e954c212c7 Story#105855968 - Prepare xml for Directo 2016-03-03 15:52:42 +02:00
Timo Võhmar
b60dc1d833 Merge pull request #85 from internetee/105846070-merge-with-105842700-arireg-for-registrant-port
105846070 merge with 105842700 arireg for registrant port
2016-02-29 17:48:17 +02:00
Timo Võhmar
3ce9ff6d64 Merge pull request #93 from internetee/109818884-server-hold-sets-force_delete_at
109818884 server hold sets force delete at
2016-02-29 16:47:31 +02:00
Vladimir Krylov
7070fd7a49 Merge branch 'story/114552597-ds-record' into staging 2016-02-26 15:25:28 +02:00
Vladimir Krylov
4106492ed3 Story#114552597 - name_in_wire_format uses puny code 2016-02-26 15:23:34 +02:00
Vladimir Krylov
e8bf3f7e64 Story#105855968 - Shorter code on pricelist type calculation 2016-02-22 14:22:53 +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
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
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
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
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
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
Vladimir Krylov
9cbc0bdc94 Merge branch '110395650-domain_crons' into staging 2016-02-02 12:42:00 +02:00
Vladimir Krylov
996e56c5cd Story#110395650 - calling instance, not class methods 2016-02-02 12:41:34 +02:00
Timo Võhmar
5992155b21 Merge pull request #76 from internetee/111237776-updateProhibited-renew
111237776 update prohibited renew
2016-02-02 12:34:51 +02:00
Vladimir Krylov
caad251237 Merge branch '110395650-domain_crons' into staging
# Conflicts:
#	app/models/domain.rb
2016-02-01 12:05:34 +02:00
Vladimir Krylov
d70c4b5d12 Story#110395650 - destroy_with_message is also extracted to class as it's used only for cron job 2016-02-01 12:03:47 +02:00
Vladimir Krylov
2028ffe5a5 Merge branch 'master' into 110395650-domain_crons
# Conflicts:
#	app/models/domain.rb
2016-02-01 12:02:44 +02:00
Stas
958cf84220 Merge branch '111864739-history_legal_doc' into staging 2016-01-26 18:35:09 +02:00
Stas
f6dd5793a4 Merge branch '109818884-server-hold-sets-force_delete_at' into staging 2016-01-26 16:28:59 +02:00
Stas
a4adb0fec0 109818884-outzone_date_change 2016-01-26 16:28:29 +02:00
Stas
fec0faa874 Merge branch '111237776-updateProhibited-renew' into staging 2016-01-25 12:14:47 +02:00
Vladimir Krylov
21ed935fe7 Merge branch 'story/112127475-cron-states' into staging
# Conflicts:
#	app/models/domain.rb
2016-01-25 11:40:45 +02:00
Vladimir Krylov
b2787a21ba Story#112127475 - server set statuses were not applied on broken domains 2016-01-25 11:37:12 +02:00
Vladimir Krylov
06c8c4a619 Merge branch 'story/112054829-expire-email' into staging 2016-01-20 16:42:57 +02:00
Vladimir Krylov
3b515ab2dd Story#112054829 - Use casting 2016-01-20 16:41:55 +02:00
Stas
07d6805aa6 111864739-legal_doc_for_pt 2016-01-19 16:51:19 +02:00
Vladimir Krylov
1de1aa7aa5 Merge remote-tracking branch 'origin/109818884-server-hold-sets-force_delete_at' into staging 2016-01-18 13:11:07 +02:00
Vladimir Krylov
233f17e6de Merge remote-tracking branch 'origin/109699502-fix-logging-string-pending_delete' into staging 2016-01-18 13:10:49 +02:00
Vladimir Krylov
5473f72d7f Merge remote-tracking branch 'origin/105846070-merge-with-105842700-arireg-for-registrant-port' into staging
# Conflicts:
#	app/models/domain.rb
2016-01-18 13:09:53 +02:00
Vladimir Krylov
5959d4a419 Merge remote-tracking branch 'origin/104525318-history_import' into staging 2016-01-18 13:08:56 +02:00