Commit graph

784 commits

Author SHA1 Message Date
Vladimir Krylov
754fb7c9e5 Merge branch '105842700-registrants_portal' into staging 2016-03-16 13:55:49 +02:00
Vladimir Krylov
f4e068de12 Story#105842700 - we don't need registrant views in registrant portal as it's usual contact 2016-03-16 13:53:11 +02:00
Vladimir Krylov
332fd9cc21 Merge branch '105842700-registrants_portal' into staging 2016-03-15 14:56:24 +02:00
Vladimir Krylov
51a0449799 Story#105842700 - registrant cannot see other contact domains (legacy from FRED) 2016-03-15 14:55:51 +02:00
Stas
a80a24ee05 Merge branch '108869472-objects_archive' into staging 2016-03-14 14:00:59 +02:00
Stas
a42049e170 108869472-template_changes 2016-03-14 13:54:00 +02:00
Vladimir Krylov
2935101d95 Merge branch '105842700-registrants_portal' into staging 2016-03-11 14:20:11 +02:00
Vladimir Krylov
1bf7315a91 Story#113525877 - Change state check from pendingDelete to pendingDeleteConfirmation 2016-03-11 14:19:48 +02:00
Vladimir Krylov
7d8cc9839f Merge branch 'story/105855968-directo' into staging
# Conflicts:
#	Gemfile
#	Gemfile.lock
2016-03-11 11:26:14 +02:00
Vladimir Krylov
519046064d Story#105855968 - Exclude registrars in directo monthly invoices 2016-03-11 11:23:11 +02:00
Stas
8f5a73a3ec 108869472-navigayion_list_added 2016-03-07 18:07:11 +02:00
Stas
a71a4dd507 Merge branch '105842700-registrants_portal' into staging 2016-03-07 13:55:20 +02:00
Stas
fe4aa3f0b3 105842700-method_for_verification_url 2016-03-07 13:53:13 +02:00
Vladimir Krylov
6f0360bae6 Merge remote-tracking branch 'origin/master' into 105842700-registrants_portal
# Conflicts:
#	config/locales/en.yml
2016-03-04 12:44:16 +02:00
Stas
1e19855c9d Merge branch '110687814-update_values' into staging 2016-03-02 19:25:28 +02:00
Stas
d3ad01f1a2 18869472-archive_changes 2016-03-02 14:36:35 +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
Stas
84fd3728d3 Merge branch '113146419-reduce_db_size' into staging 2016-02-25 16:14:39 +02:00
Stas
577762a2bc 110687814-migrations_and_values 2016-02-25 13:54:46 +02:00
Stas
88bf3f586b 113146419-request_trim_for_epp 2016-02-22 13:20:36 +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
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
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
d68dfbb103 Merge branch 'story/113066359-optimization' into staging
# Conflicts:
#	app/models/blocked_domain.rb
2016-02-11 08:38:30 +02:00
Vladimir Krylov
ca037092d3 Story#113066359 - do not load all data on sum 2016-02-11 08:36:15 +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
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
dae85b3493 Merge branch '111396946-blocked_and_reserved_view' into staging 2016-02-04 18:00:43 +02:00
Stas
db819447c6 111396946-order_and_style_changes 2016-02-04 17:24:26 +02:00
Vladimir Krylov
a842173a5d Merge branch 'story/112050051-incvoice-sort' into staging 2016-02-04 15:55:23 +02:00
Vladimir Krylov
0ce6b84ddf Story#112050051 - fix invoice sorting in admin 2016-02-04 15:54:58 +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
Timo Võhmar
938f0ea725 Merge pull request #75 from internetee/111297422-whois_blocked_domains
111297422 whois blocked domains
2016-02-02 08:52:34 +02:00
Stas
af5b67a07a Merge branch '105842700-registrants_portal' into staging 2016-02-01 15:56:12 +02:00
Timo Võhmar
3a11883cf5 Merge pull request #74 from internetee/110152326-is_registrant_filter
110152326 is registrant filter
2016-01-29 13:38:06 +02:00
Stas
a2f390aa0f 105842700-contact_search_fix 2016-01-27 16:54:59 +02:00
Vladimir Krylov
be8aa474f8 Story#105842700 - Set security 2016-01-27 13:21:45 +02:00
Vladimir Krylov
a31801514b Merge branch '105846070-merge-with-105842700-arireg-for-registrant-port' into staging 2016-01-25 18:15:48 +02:00
Stas
216c4e9fa0 105842700-routes_fix 2016-01-25 17:53:38 +02:00
Vladimir Krylov
f2f91f7286 Merge branch '105846070-merge-with-105842700-arireg-for-registrant-port' into staging 2016-01-25 14:57:32 +02:00
Vladimir Krylov
9b64989038 Story#105846070 - save error to json obj 2016-01-25 14:57:23 +02:00
Vladimir Krylov
2a620138e7 Merge branch '105846070-merge-with-105842700-arireg-for-registrant-port' into staging 2016-01-25 14:55:57 +02:00
Vladimir Krylov
a6fdb5289a Story#105846070 - save error to json obj 2016-01-25 14:55:39 +02:00