Commit graph

820 commits

Author SHA1 Message Date
Vladimir Krylov
927e7c6f1d Merge branch 'story/112601637-no-ident' into staging 2016-03-17 14:30:44 +02:00
Vladimir Krylov
320e8ac6e4 Story#112601637 - admin contacts has filter to get only ident_country_code 2016-03-17 14:30:00 +02:00
Vladimir Krylov
58e383bd25 Story#112601637 - admin contacts has filter to get only ident_country_code 2016-03-17 13:59:42 +02:00
Stas
0b6bd1b80e Merge branch '108869472-objects_archive' into staging 2016-03-16 18:51:37 +02:00
Stas
7ba760a884 108869472-changes_for_real_data 2016-03-16 18:09:53 +02:00
Vladimir Krylov
0779657b41 Merge branch 'story/105855968-directo' into staging
# Conflicts:
#	config/locales/en.yml
2016-03-16 17:51:06 +02:00
Vladimir Krylov
60c9a0a766 Story#105855968 - show Registrar#test_registrar in admin/registrars 2016-03-16 17:50:19 +02:00
Vladimir Krylov
c957bce553 Story#105855968 - change registrar parameter from exclude_in_monthly_directo to test_registrar be used more widely 2016-03-16 17:48:35 +02:00
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
Stas
518b7139f0 108869472-conditions_for_corrupted 2016-03-16 11:46:47 +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
Stas
8867644f16 108869472-styles 2016-03-13 15:08:03 +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
Timo Võhmar
30697a3b6d Merge pull request #101 from internetee/story/113066359-optimization
Story/113066359 optimization
2016-03-10 13:22:54 +02:00
Stas
8f5a73a3ec 108869472-navigayion_list_added 2016-03-07 18:07:11 +02:00
Vladimir Krylov
7d877c89e9 Merge branch '113524121-legal_doc_min_size' into staging 2016-03-07 12:23:30 +02:00
Vladimir Krylov
c772ef00d6 Story#113524121 - we have new rails, so we should use data-legal-document 2016-03-07 12:23:19 +02:00
Vladimir Krylov
08fd54792e Merge branch '113524121-legal_doc_min_size' into staging 2016-03-07 12:00:51 +02:00
Vladimir Krylov
cf3fce8055 Story#113524121 - validate in web max file 2016-03-07 12:00:23 +02:00
Vladimir Krylov
ef55560d0e Story#105855968 - send invoices to directo 2016-03-04 16:15:30 +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
992d3113e8 Merge branch '113524121-legal_doc_min_size' into staging 2016-03-02 17:50:06 +02:00
Stas
d3ad01f1a2 18869472-archive_changes 2016-03-02 14:36:35 +02:00
Stas
625b303ed6 113524121-front_end_validation 2016-02-29 18:32:45 +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
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
Stas
25b0fcfb8d Merge branch '108869472-objects_archive' into staging 2016-02-12 18:09:44 +02:00
Stas
f77e599e2f 108869472-empty_row_fix 2016-02-12 18:08:39 +02:00
Stas
81a19983a7 105842700-api_link_delete 2016-02-12 12:34:17 +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
Stas
404e52faf6 105842700-statuses_and_domains 2016-02-10 16:03:53 +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
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
dae85b3493 Merge branch '111396946-blocked_and_reserved_view' into staging 2016-02-04 18:00:43 +02:00
Stas
2650ca1922 111396946-style_change 2016-02-04 17:59:48 +02:00
Stas
db819447c6 111396946-order_and_style_changes 2016-02-04 17:24:26 +02:00