Commit graph

847 commits

Author SHA1 Message Date
Stas
913ac1f374 Merge branch '114554395-log_limits' into staging 2016-03-24 17:37:17 +02:00
Stas
b73ef11cc3 114554395-param_changes 2016-03-24 14:43:21 +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
306819eeaf story#115762063 - add links to just domain version view 2016-03-23 00:05:55 +02:00
Vladimir Krylov
ffe2ddd02c Merge remote-tracking branch 'origin/108869472-objects_archive' into story/115762063--show-historical-nested
# Conflicts:
#	app/views/admin/domain_versions/_version.haml
#	app/views/admin/domain_versions/index.haml
2016-03-22 23:51:21 +02:00
Vladimir Krylov
5a582d872d Merge remote-tracking branch 'origin/108869472-objects_archive' into story/115762063--show-historical-nested
# Conflicts:
#	app/views/admin/domain_versions/_version.haml
#	app/views/admin/domain_versions/index.haml
2016-03-22 23:51:03 +02:00
Stas
eb24f17a30 Merge branch '108869472-objects_archive' into staging 2016-03-22 21:59:28 +02:00
Stas
7eeb889b22 108869472-old_template_delete 2016-03-22 21:45:25 +02:00
Stas
0dc1442c1a 10886972-dublicate_view_deleted 2016-03-22 18:37:19 +02:00
Stas
81c4106468 Merge branch '114554395-log_limits' into staging 2016-03-22 18:15:01 +02:00
Stas
9e9d0a305a 114554395-clear_fields_modification 2016-03-22 18:14:19 +02:00
Vladimir Krylov
5cce1ed2c8 Merge remote-tracking branch 'origin/108869472-objects_archive' into story/115762063--show-historical-nested
# Conflicts:
#	app/controllers/admin/domain_versions_controller.rb
#	config/locales/en.yml
2016-03-22 16:03:52 +02:00
Vladimir Krylov
92b64d6268 Story#115762063 - add links to versions list 2016-03-22 15:53:47 +02:00
Vladimir Krylov
028aa31232 Story#115762063 - all contacts are using the same versions logic 2016-03-22 15:17:36 +02:00
Vladimir Krylov
779a47c80f Story#105842700 - found some way how to load historical objects. Data will be extracted 2016-03-22 11:43:24 +02:00
Timo Võhmar
71e3db611b Merge pull request #107 from internetee/105842700-registrants_portal
105842700 registrants portal
2016-03-22 11:36:36 +02:00
Timo Võhmar
7b3a109a99 Merge pull request #106 from internetee/story/112601637-no-ident
Story/112601637 no ident
2016-03-22 11:11:12 +02:00
Stas
664c79e248 Merge branch '114554395-log_limits' into staging 2016-03-21 20:21:15 +02:00
Stas
ffb76c7372 114554395-start_date_added 2016-03-21 20:15:36 +02:00
Vladimir Krylov
cc714460f2 Merge remote-tracking branch 'origin/105842700-registrants_portal' into staging 2016-03-21 14:02:10 +02:00
Vladimir Krylov
778284c14b Story#105842700 - show titles in registrant's domain, contact and contact name 2016-03-21 14:01:50 +02:00
Vladimir Krylov
4f458adb0f Merge branch 'story/105855968-directo' into staging
# Conflicts:
#	config/locales/en.yml
2016-03-21 12:20:33 +02:00
Vladimir Krylov
d67db2d7c8 Story#105855968 - admin/show mark if registrar is test 2016-03-21 12:18:48 +02:00
Vladimir Krylov
43ea28a8ba Merge branch 'story/112601637-no-ident' into staging 2016-03-18 16:10:22 +02:00
Vladimir Krylov
b4911911e2 Story#112601637 - update ident cc missing filter name 2016-03-18 16:10:02 +02:00
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
0a5428f2ee Merge remote-tracking branch 'origin/master' into 113524121-legal_doc_min_size
# Conflicts:
#	public/assets/.sprockets-manifest-48c2dd3ff16b86b70040480e74a50543.json
#	public/assets/registrant-manifest.js
#	public/assets/registrar-manifest.css
#	public/assets/registrar-manifest.js
#	public/assets/registrar/application.js
2016-03-16 15:09: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