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 |
|
Stas
|
81a19983a7
|
105842700-api_link_delete
|
2016-02-12 12:34:17 +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 |
|
Stas
|
404e52faf6
|
105842700-statuses_and_domains
|
2016-02-10 16:03:53 +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
|
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 |
|
Stas
|
a5f3cfd2b0
|
Merge branch '105842700-registrants_portal' into staging
|
2016-01-27 12:00:52 +02:00 |
|
Stas
|
438f77a981
|
105842700-roles_sort_contact_part
|
2016-01-26 18:12:31 +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 |
|
Vladimir Krylov
|
a31801514b
|
Merge branch '105846070-merge-with-105842700-arireg-for-registrant-port' into staging
|
2016-01-25 18:15:48 +02:00 |
|
Stas
|
216c4e9fa0
|
105842700-routes_fix
|
2016-01-25 17:53:38 +02:00 |
|
Timo Võhmar
|
191c7408b4
|
Merge pull request #69 from internetee/111068694-expiration_mail_date
111068694 expiration mail date
|
2016-01-25 13:43:41 +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 |
|
Timo Võhmar
|
7039e46fed
|
Merge pull request #67 from internetee/110211760-upID-updDate-in-pending-transform
Story #110211760 - ensure that upDate is not shown when domain has no…
|
2016-01-21 15:36:29 +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 |
|
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
|
7ab74272d3
|
Merge remote-tracking branch 'origin/111068694-expiration_mail_date' into staging
|
2016-01-18 13:14:24 +02:00 |
|
Vladimir Krylov
|
b9239bf67e
|
Merge remote-tracking branch 'origin/110211760-upID-updDate-in-pending-transform' into staging
|
2016-01-18 13:11:43 +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
|
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
|
764abdfd89
|
111297422-whitespaces
|
2016-01-13 15:54:30 +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 |
|