Commit graph

893 commits

Author SHA1 Message Date
Stas
4dc51a8484 Merge branch '117806281-clickable_actions' into staging 2016-04-28 15:33:36 +03:00
Stas
e3f3708108 117806281-typo 2016-04-28 15:33:17 +03:00
Stas
628813f604 Merge branch '117806281-clickable_actions' into staging 2016-04-28 15:23:58 +03:00
Stas
096c23f55e 117806281-clickable_actions 2016-04-28 15:09:51 +03:00
Stas
998a0043da Merge branch '117350717-admin_sorting' into staging 2016-04-25 18:15:14 +03:00
Stas
f45b497876 117350717-sorting_fixes 2016-04-25 18:13:52 +03:00
Stas
c8d950a7ae Merge branch '116209751-verified_option' into staging 2016-04-24 16:50:28 +03:00
Stas
5025758bc1 116209751-typo 2016-04-24 16:49:59 +03:00
Stas
0466f276e3 Merge branch '116209751-verified_option' into staging 2016-04-24 16:26:48 +03:00
Stas
6a49099b52 116209751-template_fix 2016-04-22 15:13:16 +03:00
Vladimir Krylov
e00a00e03f Merge branch 'story/115762063--show-historical-nested' into staging 2016-04-22 11:12:30 +03:00
Vladimir Krylov
17765cbf14 Story#115762063 - escape dots for haml 2016-04-22 11:12:07 +03:00
Stas
0a73085ac2 Merge branch '108869472-objects_archive' into staging 2016-04-21 17:05:52 +03:00
Stas
95dce72bd6 108869472-template_view_modified 2016-04-21 16:21:19 +03:00
Stas
a09e6b1a42 108869472-new_qieries_and_views 2016-04-21 15:21:59 +03:00
Timo Võhmar
2ed53f3e3e Merge branch 'contact-email-update-notice-typos' into staging
Fixed typos in automated e-mails sent on registrant e-mail update
2016-04-20 16:25:40 +03:00
Timo Võhmar
045b285b37 fixed typos in contact update e-mail messages 2016-04-20 15:35:32 +03:00
Vladimir Krylov
d732b393bf Merge branch 'story/115762063--show-historical-nested' into staging 2016-04-19 11:57:39 +03:00
Vladimir Krylov
0c738a5cba Story#115762063 - add dots before secure code in history 2016-04-19 11:57:20 +03:00
Stas
a769b9c047 Merge branch '117226457-registrar_client_domain_view' into staging 2016-04-18 15:41:01 +03:00
Stas
16641ce2c2 117226457-css_changes 2016-04-18 15:40:29 +03:00
Stas
a82f096fef 117226457-name_for_contacts 2016-04-18 15:32:14 +03:00
Stas
b20a0ae2b2 Merge branch '108869472-objects_archive' into staging 2016-04-14 18:21:46 +03:00
Stas
014c466c47 108869472-modification_for_archive 2016-04-14 17:16:24 +03:00
Vladimir Krylov
7b3d447a65 Merge branch 'story/117124725-registrant-change' into staging
# Conflicts:
#	app/jobs/domain_delete_confirm_job.rb
2016-04-14 13:44:44 +03:00
Stas
55c6bac1d8 108869472-archive_modifications 2016-04-13 19:12:58 +03:00
Vladimir Krylov
b456a02e83 Merge branch 'story/115762063--show-historical-nested' into staging 2016-04-13 09:53:45 +03:00
Vladimir Krylov
8b25a2d30e Story#115762063 - add double scroll 2016-04-13 09:53:15 +03:00
Vladimir Krylov
d25285fbb6 Merge branch 'story/115762063--show-historical-nested' into staging 2016-04-12 10:00:04 +03:00
Vladimir Krylov
6545ac2ae6 Story#115762063 - preload name 2016-04-12 09:59:44 +03:00
Stas
c0bf69a5f8 Merge branch '116209751-verified_option' into staging 2016-04-08 18:15:30 +03:00
Stas
55af3c8326 116209751-params_change 2016-04-08 15:54:46 +03:00
Vladimir Krylov
3e80f05694 Merge branch 'story/117124725-registrant-change' into staging 2016-04-08 15:00:02 +03:00
Vladimir Krylov
a091c62264 Story#117124725 - generate emails of apply_pending_update! only when everything is ok 2016-04-08 14:58:56 +03:00
Stas
6ce40e1f8b Merge branch '116209751-verified_option' into staging 2016-04-05 15:10:29 +03:00
Stas
442b2b5a71 116209751-css_modification 2016-04-05 14:52:27 +03:00
Vladimir Krylov
f66750329b Merge branch 'story/115762063--show-historical-nested' into staging 2016-04-05 09:31:13 +03:00
Vladimir Krylov
d5da0f8881 story#115762063 - render in domain history publickey's only meaning numbers 2016-04-05 09:15:24 +03:00
Vladimir Krylov
3052e3dc16 story#115762063 - render in domain history publickey's only meaning numbers 2016-04-05 09:10:00 +03:00
Stas
b80734808b Merge branch '116209751-verified_option' into staging 2016-03-31 17:53:08 +03:00
Stas
a75d8c8407 116209751-option_added 2016-03-31 17:51:40 +03:00
Vladimir Krylov
03784ad1e3 story#115762063 - render link to pure history 2016-03-30 17:11:50 +03:00
Vladimir Krylov
da0f11d47f story#115762063 - render link to pure history 2016-03-29 18:08:31 +03:00
Vladimir Krylov
44e5f10c38 story#115762063 - show all dnskey attributes in history 2016-03-29 18:05:46 +03:00
Timo Võhmar
abad5accf8 Merge pull request #109 from internetee/114554395-log_limits
114554395 log limits
2016-03-29 11:43:10 +03:00
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