Commit graph

347 commits

Author SHA1 Message Date
Stas
25b0fcfb8d Merge branch '108869472-objects_archive' into staging 2016-02-12 18:09:44 +02:00
Stas
f77e599e2f 108869472-empty_row_fix 2016-02-12 18:08:39 +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
Vladimir Krylov
4bd3a4f3ff Merge branch 'story/112050051-incvoice-sort' into staging 2016-02-08 10:36:47 +02:00
Vladimir Krylov
db6f78ede4 Story#112050051 - extend ransack to sort invoices by custom scopes 2016-02-08 10:36:22 +02:00
Stas
dae85b3493 Merge branch '111396946-blocked_and_reserved_view' into staging 2016-02-04 18:00:43 +02:00
Stas
2650ca1922 111396946-style_change 2016-02-04 17:59:48 +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
3a11883cf5 Merge pull request #74 from internetee/110152326-is_registrant_filter
110152326 is registrant filter
2016-01-29 13:38:06 +02:00
Vladimir Krylov
134514cbb3 Merge branch '105846070-merge-with-105842700-arireg-for-registrant-port' into staging 2016-01-25 18:24:50 +02:00
Vladimir Krylov
0b3079b8b5 Story#105846070 - Admin can edit setting days_to_keep_business_registry_cache 2016-01-25 18:22:34 +02:00
Timo Võhmar
0f2b36deb5 Merge pull request #68 from internetee/111219288-history_view
111219288-template_fix_for_corrupted_log
2016-01-21 16:17:52 +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
Vladimir Krylov
0dd624f7cb Merge branch 'story/105852786-directo' into staging 2016-01-18 20:26:21 +02:00
Vladimir Krylov
975dd52368 Story#105852786 - Sales agent is set by config 2016-01-18 20:26:03 +02:00
Stas
b111285334 111396946-templates_and_actions 2016-01-18 14:20:27 +02:00
Vladimir Krylov
49e66d33de Story#105852786 - Push bank transfers to directo 2016-01-18 14:13:28 +02:00
Vladimir Krylov
fdda3c58dd Merge remote-tracking branch 'origin/story/108091488-reserved-domains' into staging 2016-01-18 13:17:51 +02:00
Vladimir Krylov
b304f69696 Merge remote-tracking branch 'origin/111219288-history_view' into staging 2016-01-18 13:14:33 +02:00
Vladimir Krylov
a1cde841a2 Merge remote-tracking branch 'origin/110152326-is_registrant_filter' into staging 2016-01-18 13:11:25 +02:00
Stas
b85a637ef2 111219288-template_fix_for_corrupted_log 2016-01-15 17:34:05 +02:00
Vladimir Krylov
6ca72a26fe Story#105852786 - Directo product name is a setting now 2016-01-14 09:36:11 +02:00
Stas
9278e6703f 108869472-archive 2016-01-12 18:37:05 +02:00
Timo Võhmar
09d5dbe1d2 Merge pull request #62 from internetee/story/111065230-expiration-remnder
Story/111065230 expiration remnder
2016-01-12 15:48:14 +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
96552a0344 107279984-filter_changes 2016-01-11 15:44:26 +02:00
Stas
a8ff887717 108869472-template_changes 2016-01-07 13:07:06 +02:00
Vladimir Krylov
c0f9a0105e Story#111065230 - send expiration_reminder Mail 2 days after 2016-01-06 17:30:05 +02:00
Stas
cbe0193cbf 107279984-balance_fix 2016-01-05 17:57:56 +02:00
Stas
f3d22e0145 110152326-registrar_portal_filter 2016-01-05 14:41:09 +02:00
Stas
f46c7f5543 110152326-is_registrant_filter_modification 2016-01-04 16:35:02 +02:00
Stas
6909f3d0ef 10729984-starting_balance 2015-12-18 13:30:51 +02:00
Stas
bbd90127af 109809872-template_changes 2015-12-11 12:07:46 +02:00
Stas
f142539827 108869472-templates 2015-12-11 10:58:33 +02:00
Stas
2fe026715a 1088869472-methods_for_archive 2015-12-10 11:17:48 +02:00
Stas
0fd682c6b9 107279984-credit_balance_views 2015-12-09 14:00:31 +02:00
Vladimir Krylov
163c00f979 fix typo 2015-12-01 04:10:49 +02:00
Vladimir Krylov
5d1f691967 white IPs in admin generate ip link only if they exists 2015-12-01 01:08:04 +02:00
Matt Farnsworth
88973c5241 Story #107192666 - change setting value and symbol, admin configures ds_digest_type 2015-11-25 13:11:38 +02:00
Matt Farnsworth
a5ca401528 Merge branch '104525314-domain-object-states' into staging 2015-11-23 09:34:33 +02:00