Commit graph

4268 commits

Author SHA1 Message Date
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
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
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
a5e43ddec1 Merge branch '105842700-registrants_portal' into staging 2016-03-17 16:21:30 +02:00
Vladimir Krylov
ad4ccbb767 Story#105842700 - Add registrants to allowed contacts 2016-03-17 16:20:55 +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
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
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
Timo Võhmar
9e32f71d2f Merge pull request #104 from internetee/113524121-legal_doc_min_size
113524121 legal doc min size
2016-03-16 17:13:23 +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
e4ade092ce 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:10:45 +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
933279dba2 Merge branch '113524121-legal_doc_min_size' into staging 2016-03-16 11:41:30 +02:00
Vladimir Krylov
004884801d Story#113524121 - update legal doc validation messages 2016-03-16 11:38:17 +02:00
Timo Võhmar
63e807a27d Merge pull request #103 from internetee/112602007-incomplete_update_query
112602007-condition_changed
2016-03-15 17:21:33 +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