Stas
|
f77e599e2f
|
108869472-empty_row_fix
|
2016-02-12 18:08:39 +02:00 |
|
Stas
|
aa0a25a609
|
Merge branch '110412166-registrant_change' into staging
|
2016-02-12 14:09:12 +02:00 |
|
Stas
|
81a19983a7
|
105842700-api_link_delete
|
2016-02-12 12:34:17 +02:00 |
|
Vladimir Krylov
|
af28b9e3f2
|
Merge branch 'story/113066359-optimization' into staging
# Conflicts:
# app/jobs/regenerate_registrar_whoises_job.rb
# app/jobs/regenerate_whois_record_job.rb
# app/models/blocked_domain.rb
|
2016-02-11 12:26:58 +02:00 |
|
Vladimir Krylov
|
3b3708e4ea
|
Story#113066359 - remove obsolete job class
|
2016-02-11 12:23:10 +02:00 |
|
Vladimir Krylov
|
78ffe33dfa
|
Story#113066359 - extract reserved domains regen password from domain to reserved domain
|
2016-02-11 12:17:11 +02:00 |
|
Vladimir Krylov
|
77da9ccd2b
|
Story#113066359 - all whois generation of domain and reserved/blocked domain is async + domain destroy removes whois async
|
2016-02-11 12:04:16 +02:00 |
|
Vladimir Krylov
|
93d765dea2
|
Story#113066359 - all whois generation of domain and reserved/blocked domain is async + domain destroy removes whois async
|
2016-02-11 11:48:19 +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 |
|
Timo Võhmar
|
ca62bfaed5
|
Merge pull request #84 from internetee/story/112050051-incvoice-sort
Story/112050051 incvoice sort
|
2016-02-10 15:57:37 +02:00 |
|
Vladimir Krylov
|
e2cb9e99c4
|
Story#105855968 - Shorter code on pricelist type calculation
|
2016-02-10 14:31:48 +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
|
185e1d5c93
|
110687814-update_function
|
2016-02-10 10:38:47 +02:00 |
|
Stas
|
c3d76ab13f
|
110412166-validation_for_registrant_change
|
2016-02-08 16:36:54 +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
|
4f83d5c720
|
Merge branch '109818884-server-hold-sets-force_delete_at' into staging
|
2016-02-05 15:46:26 +02:00 |
|
Stas
|
d5f4edbade
|
109818884-plus_15_days_added
|
2016-02-05 15:38:53 +02:00 |
|
Timo Võhmar
|
89292bea53
|
Merge pull request #80 from internetee/story/112993395-reserved-password
Story#112993395 - in reserved domains we are using columns, not hash
|
2016-02-05 14:27:00 +02:00 |
|
Stas
|
a18df56c18
|
Merge branch '111864739-history_legal_doc' into staging
|
2016-02-05 13:00:14 +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 |
|
Vladimir Krylov
|
a13463a36f
|
Merge branch 'story/112993395-reserved-password' into staging
|
2016-02-04 17:54:17 +02:00 |
|
Vladimir Krylov
|
6984bb9bae
|
Story#112993395 - in reserved domains we are using columns, not hash
|
2016-02-04 17:53:54 +02:00 |
|
Stas
|
db819447c6
|
111396946-order_and_style_changes
|
2016-02-04 17:24:26 +02:00 |
|
Stas
|
59f7f364ad
|
11186739-revert_to_2430bfebf2f5ed3471e88f0b8ed2597b603c96e6
|
2016-02-04 16:32:30 +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 |
|
Vladimir Krylov
|
3bd972574e
|
Merge branch '104525318-history_import' into staging
|
2016-02-04 11:27:01 +02:00 |
|
Vladimir Krylov
|
04b2cf2365
|
Story#111397154 - set extra scope ids to import only needed data
|
2016-02-04 11:26:09 +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 |
|
teadur
|
c03a1b78ef
|
Merge pull request #79 from internetee/gem-updates
generate assets when missed
|
2016-02-03 16:14:19 +02:00 |
|
Georg Kahest
|
2ebf6c6ebb
|
generate assets when missed
|
2016-02-03 16:13:12 +02:00 |
|
Stas
|
2ab5d8500a
|
111396946-views_methods
|
2016-02-03 15:55:39 +02:00 |
|
teadur
|
0af60d82a3
|
Merge pull request #78 from internetee/gem-updates
Gem updates
|
2016-02-03 14:56:15 +02:00 |
|
Georg Kahest
|
02fbf3cb8d
|
rails/activerecords and deps
|
2016-02-03 14:50:03 +02:00 |
|
Georg Kahest
|
b6786e5eb8
|
security updates for other gems
|
2016-02-03 14:38:33 +02:00 |
|
Timo Võhmar
|
98298d9258
|
Merge pull request #77 from internetee/story/112965483-skip-blocked-domains
Story/112965483 skip blocked domains
|
2016-02-03 13:14:00 +02:00 |
|
Vladimir Krylov
|
0de322f634
|
Merge branch 'story/112965483-skip-blocked-domains' into staging
|
2016-02-03 12:20:54 +02:00 |
|
Vladimir Krylov
|
54c86e15a3
|
Story#112965483 - we need to return from method, no iteration here
|
2016-02-03 12:20:42 +02:00 |
|
Vladimir Krylov
|
d5eebc5b09
|
Merge branch 'story/112965483-skip-blocked-domains' into staging
|
2016-02-03 11:35:36 +02:00 |
|
Vladimir Krylov
|
2fea2975f6
|
Story#112965483 - skip removing whoises for reserved and blocked domains if domain exists
|
2016-02-03 11:35:26 +02:00 |
|
Vladimir Krylov
|
95ccc81092
|
Merge branch 'staging' of github.com:internetee/registry into staging
|
2016-02-03 11:27:17 +02:00 |
|
Vladimir Krylov
|
1fdc8ed023
|
Merge branch 'story/112965483-skip-blocked-domains' into staging
|
2016-02-03 11:27:10 +02:00 |
|
Vladimir Krylov
|
3e929a895c
|
Story#112965483 - skip generating whoises for reserved and blocked domains if domain exists
|
2016-02-03 11:26:55 +02:00 |
|