Commit graph

287 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
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
Vladimir Krylov
927e7c6f1d Merge branch 'story/112601637-no-ident' into staging 2016-03-17 14:30:44 +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
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
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
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
Stas
d3ad01f1a2 18869472-archive_changes 2016-03-02 14:36:35 +02:00
Vladimir Krylov
afd3b06f62 Merge remote-tracking branch 'origin/master' into 105846070-merge-with-105842700-arireg-for-registrant-port
# Conflicts:
#	app/models/domain.rb
2016-02-15 10:11:07 +02:00
Vladimir Krylov
d68dfbb103 Merge branch 'story/113066359-optimization' into staging
# Conflicts:
#	app/models/blocked_domain.rb
2016-02-11 08:38:30 +02:00
Vladimir Krylov
ca037092d3 Story#113066359 - do not load all data on sum 2016-02-11 08:36:15 +02:00
Stas
fea6f046e6 Merge branch '108869472-objects_archive' into staging 2016-02-10 17:46:19 +02:00
Timo Võhmar
bd4477f962 Merge pull request #83 from internetee/111396946-blocked_and_reserved_view
111396946 blocked and reserved view
2016-02-10 17:20:55 +02:00
Vladimir Krylov
fd9fca741a Merge remote-tracking branch 'origin/master' into 111396946-blocked_and_reserved_view2
# Conflicts:
#	app/controllers/admin/blocked_domains_controller.rb
#	app/models/blocked_domain.rb
2016-02-10 11:10:49 +02:00
Stas
dae85b3493 Merge branch '111396946-blocked_and_reserved_view' into staging 2016-02-04 18:00:43 +02:00
Stas
db819447c6 111396946-order_and_style_changes 2016-02-04 17:24:26 +02:00
Vladimir Krylov
a842173a5d Merge branch 'story/112050051-incvoice-sort' into staging 2016-02-04 15:55:23 +02:00
Vladimir Krylov
0ce6b84ddf Story#112050051 - fix invoice sorting in admin 2016-02-04 15:54:58 +02:00
Stas
3178c13fd4 Merge branch '111396946-blocked_and_reserved_view' into staging 2016-02-03 17:21:03 +02:00
Stas
f31db65d2c 111396946-validates 2016-02-03 17:17:38 +02:00
Stas
2ab5d8500a 111396946-views_methods 2016-02-03 15:55:39 +02:00
Timo Võhmar
938f0ea725 Merge pull request #75 from internetee/111297422-whois_blocked_domains
111297422 whois blocked domains
2016-02-02 08:52:34 +02:00
Timo Võhmar
3a11883cf5 Merge pull request #74 from internetee/110152326-is_registrant_filter
110152326 is registrant filter
2016-01-29 13:38:06 +02:00
Georg Kahest
6814a7569f Merged branch 111297422-whois_blocked_domains into staging 2016-01-21 12:13:58 +02:00
Vladimir Krylov
7648d59f37 Merge remote-tracking branch 'origin/111396946-blocked_and_reserved_view' into staging 2016-01-20 16:28:57 +02:00
Stas
793bc359ea 111396946-methods 2016-01-20 15:44:55 +02:00
Stas
b111285334 111396946-templates_and_actions 2016-01-18 14:20:27 +02:00
Vladimir Krylov
a1cde841a2 Merge remote-tracking branch 'origin/110152326-is_registrant_filter' into staging 2016-01-18 13:11:25 +02:00
Vladimir Krylov
5473f72d7f Merge remote-tracking branch 'origin/105846070-merge-with-105842700-arireg-for-registrant-port' into staging
# Conflicts:
#	app/models/domain.rb
2016-01-18 13:09:53 +02:00
Stas
f019bf5e0d 110152326-filter_fix 2016-01-13 15:41:21 +02:00
Stas
9278e6703f 108869472-archive 2016-01-12 18:37:05 +02:00
Timo Võhmar
8e79e67d9d Merge pull request #61 from internetee/107279984-credit_balance
107279984 credit balance
2016-01-12 14:33:08 +02:00
Stas
c4ead607da 107279984-refactor 2016-01-11 17:02:35 +02:00
Stas
96552a0344 107279984-filter_changes 2016-01-11 15:44:26 +02:00
Stas
4a0b1fea39 111297422-mask_fix 2016-01-11 11:03:31 +02:00
Stas
11d543d967 111297422-blocked_domains 2016-01-11 10:12:15 +02:00
Stas
a440169eaf 11031910-callbacks_for_whois_server 2016-01-06 15:04:02 +02:00
Stas
cbe0193cbf 107279984-balance_fix 2016-01-05 17:57:56 +02:00
Vladimir Krylov
6415bfae38 Story#108091488 - Seems that now reserved domains will be in better table 2016-01-05 14:08:51 +02:00