Commit graph

763 commits

Author SHA1 Message Date
Stas
0c63f0fa54 Merge branch '111864739-history_legal_doc' into staging
* 111864739-history_legal_doc:
  111864739-contact_and_domain_create
2016-02-17 18:40:32 +02:00
Stas
e60a6ae647 Merge branch '105842700-registrants_portal' into staging
* 105842700-registrants_portal:
  105842700-related_commit_for_113525877
2016-02-17 17:54:07 +02:00
Stas
9df7e7cb9c 105842700-related_commit_for_113525877 2016-02-17 17:48:55 +02:00
Stas
6ebcaf69d0 111864739-contact_and_domain_create 2016-02-15 17:52:30 +02:00
Stas
5a9f4125ef Merge branch '105842700-registrants_portal' into staging 2016-02-15 12:38:49 +02:00
Stas
e077ba7ee8 105842700-contact_and_domain_query_change 2016-02-15 12:38:05 +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
Stas
af5b67a07a Merge branch '105842700-registrants_portal' into staging 2016-02-01 15:56:12 +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
a2f390aa0f 105842700-contact_search_fix 2016-01-27 16:54:59 +02:00
Vladimir Krylov
be8aa474f8 Story#105842700 - Set security 2016-01-27 13:21:45 +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
Vladimir Krylov
f2f91f7286 Merge branch '105846070-merge-with-105842700-arireg-for-registrant-port' into staging 2016-01-25 14:57:32 +02:00
Vladimir Krylov
9b64989038 Story#105846070 - save error to json obj 2016-01-25 14:57:23 +02:00
Vladimir Krylov
2a620138e7 Merge branch '105846070-merge-with-105842700-arireg-for-registrant-port' into staging 2016-01-25 14:55:57 +02:00
Vladimir Krylov
a6fdb5289a Story#105846070 - save error to json obj 2016-01-25 14:55:39 +02:00
Vladimir Krylov
19d9d3bf84 Merge branch '105846070-merge-with-105842700-arireg-for-registrant-port' into staging 2016-01-25 14:38:03 +02:00
Vladimir Krylov
9bc34ed9ef Story#105846070 - save error to json obj 2016-01-25 14:37:43 +02:00
Stas
28ec97fe2f Merge branch '110152326-is_registrant_filter' into staging 2016-01-25 11:58:46 +02:00
Stas
df68b705ff 110152326-distinct_added 2016-01-25 11:58:13 +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
Stas
f3d22e0145 110152326-registrar_portal_filter 2016-01-05 14:41:09 +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