Commit graph

4696 commits

Author SHA1 Message Date
Stas
b70012045e Merge branch '110687814-update_values' into staging 2016-03-24 17:36:06 +02:00
Stas
5c2033a8a8 110687814-update_order_change 2016-03-24 17:31:17 +02:00
Stas
21e74dce21 110687814-contact_value_modification 2016-03-24 16:33:32 +02:00
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
536b62b229 Merge branch 'story/114871365-address-cc-upcase' into staging 2016-03-24 15:33:48 +02:00
Vladimir Krylov
2a7de9fbd6 Story#114871365 - fix imported old fred history 2016-03-24 15:32:44 +02:00
Stas
b73ef11cc3 114554395-param_changes 2016-03-24 14:43:21 +02:00
Stas
4e51adb08e 115040781-legal_doc_check_and_save 2016-03-24 12:01:10 +02:00
Vladimir Krylov
1dedb22027 Merge branch 'story/114871365-address-cc-upcase' into staging 2016-03-23 18:55:38 +02:00
Vladimir Krylov
4ab4ba6f97 Story#114871365 - add to country_code updater functionality to update it in log table 2016-03-23 18:55:04 +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
Stas
667ce87078 111864739-revert_scope 2016-03-23 18:17:05 +02:00
Stas
f57fffe2c7 Merge branch '111864739-history_legal_doc' into staging 2016-03-23 12:29:06 +02:00
Stas
61f08cda9a 111864739-method_scope_changed 2016-03-23 12:15:27 +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
Timo Võhmar
48556e5f74 Merge pull request #108 from internetee/story/105855968-directo
Story/105855968 directo
2016-03-22 15:37:59 +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
adfb138197 Merge remote-tracking branch 'origin/master' into story/105855968-directo
# Conflicts:
#	Gemfile
#	Gemfile.lock
2016-03-22 11:47:32 +02:00
Vladimir Krylov
da7fed9577 Merge remote-tracking branch 'origin/master' into story/105855968-directo
# Conflicts:
#	Gemfile
#	Gemfile.lock
2016-03-22 11:47:18 +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
Stas
195c9fc242 Merge branch '115040781-legaldoc_on_delete' into staging 2016-03-21 15:54:49 +02:00
Stas
e9978cb458 Merge branch '110687814-update_values' into staging 2016-03-21 15:51:41 +02:00
Stas
ed17431ebc 110687814-values_for_pending_apply 2016-03-21 15:17:00 +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
Timo Võhmar
59ed022d8d Merge pull request #105 from internetee/115336093-column_missing
115336093-added_registrar_code
2016-03-18 16:25:13 +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
92605d7a08 Merge branch '111864739-history_legal_doc' into staging
# Conflicts:
#	app/models/legal_document.rb
2016-03-18 16:00:32 +02:00
Vladimir Krylov
71aae06dd1 Story#111864739 - epp validation 2016-03-18 15:59:14 +02:00
Stas
6f0f6b98f9 Merge branch '115336093-column_missing' into staging 2016-03-18 15:42:06 +02:00
Stas
c5e130b5c3 115336093-added_registrar_code 2016-03-18 15:41:40 +02:00
Vladimir Krylov
44077a1788 Merge branch '111864739-history_legal_doc' into staging 2016-03-18 14:43:54 +02:00