Commit graph

1586 commits

Author SHA1 Message Date
Vladimir Krylov
aa3ca96d41 Merge branch '111864739-history_legal_doc' into staging 2016-03-28 20:16:58 +03:00
Vladimir Krylov
bd049968e1 story#115040421 - remove double save of legal doc on contact update 2016-03-28 20:16:27 +03:00
Vladimir Krylov
ed477d4505 Merge branch 'story/114871365-address-cc-upcase' into staging 2016-03-28 11:41:01 +03:00
Vladimir Krylov
b682deeb9e story#114871365 - revert prefix code name generation 2016-03-28 11:40:34 +03:00
Stas
9d4ba7836b Merge branch '115040781-legaldoc_on_delete' into staging 2016-03-24 17:40:59 +02:00
Stas
04753e42b9 Merge branch '111864739-history_legal_doc' into staging 2016-03-24 17:39:22 +02:00
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
Stas
4e51adb08e 115040781-legal_doc_check_and_save 2016-03-24 12:01:10 +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
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
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
028aa31232 Story#115762063 - all contacts are using the same versions logic 2016-03-22 15:17:36 +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
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
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
Vladimir Krylov
14b246d692 Story#111864739 - do not throw an error. 2016-03-18 14:43:21 +02:00
Stas
431eaf5439 1150040781-contact_delete_legal_doc 2016-03-17 18:32:55 +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
0779657b41 Merge branch 'story/105855968-directo' into staging
# Conflicts:
#	config/locales/en.yml
2016-03-16 17:51:06 +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
a950e9e4a7 Story#105855968 - Directo payment term on directo monthly nvoice is also taken from directo_receipt_payment_term 2016-03-16 15:52:51 +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
c30adb7bce Merge branch 'story/105855968-directo' into staging 2016-03-15 17:13:18 +02:00
Vladimir Krylov
57bf11517c Story#115405945 - better debug message on directo 2016-03-15 17:00:34 +02:00
Vladimir Krylov
6459e89705 Story#105855968 - counter is outside of namespace 2016-03-15 16:59:46 +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
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
43a8eaf141 Merge branch '112602007-incomplete_update_query' into staging 2016-03-15 14:55:31 +02:00
Stas
4fc4e4c36e 112602007-condition_changed 2016-03-15 14:54:50 +02:00
Stas
35e7055c7b 110687814-update_point_changed 2016-03-15 13:01:25 +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
57673bd79d Merge branch '113524121-legal_doc_min_size' into staging 2016-03-11 15:41:48 +02:00