zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-04 10:13:34 +02:00
Code Issues Projects Releases Packages Wiki Activity
4144 commits 296 branches 269 tags 144 MiB
Commit graph

831 commits

Author SHA1 Message Date
Vladimir Krylov
fe930c7535 Merge branch '104525318-history_import' into staging 
# Conflicts:
#	Gemfile
#	app/models/domain.rb
#	config/locales/en.yml
 2016-03-04 14:48:41 +02:00
Vladimir Krylov
34dd6af4f7 Merge remote-tracking branch 'origin/master' into 104525318-history_import 
# Conflicts:
#	Gemfile
#	app/models/domain.rb
 2016-03-04 14:21:22 +02:00
Vladimir Krylov
3d180ec45a Merge remote-tracking branch 'origin/master' into 110412166-registrant_change 2016-03-03 17:04:19 +02:00
Timo Võhmar
b60dc1d833 Merge pull request #85 from internetee/105846070-merge-with-105842700-arireg-for-registrant-port 
105846070 merge with 105842700 arireg for registrant port
 2016-02-29 17:48:17 +02:00
Timo Võhmar
a218a0b5f2 Merge pull request #87 from internetee/110395650-domain_crons 
110395650 domain crons
 2016-02-18 20:09:56 +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
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
Stas
aa0a25a609 Merge branch '110412166-registrant_change' into staging 2016-02-12 14:09:12 +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
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
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
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
Vladimir Krylov
ed178542f6 Merge branch '110395650-domain_crons' into staging 2016-02-02 13:43:23 +02:00
Vladimir Krylov
c24e277103 Story#110395650 - deprecation logs are shown in staging and production now as well 2016-02-02 13:43:05 +02:00
Vladimir Krylov
caad251237 Merge branch '110395650-domain_crons' into staging 
# Conflicts:
#	app/models/domain.rb
 2016-02-01 12:05:34 +02:00
Vladimir Krylov
2028ffe5a5 Merge branch 'master' into 110395650-domain_crons 
# Conflicts:
#	app/models/domain.rb
 2016-02-01 12:02:44 +02:00
Timo Võhmar
d38d2eeb6f Merge pull request #72 from internetee/story/109590460-ident-update 
Story/109590460 ident update
 2016-01-29 09:03:48 +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
451a3029b4 Merge branch 'story/105852786-directo' into staging 2016-01-19 15:02:42 +02:00
Vladimir Krylov
6c8bab56bf Story#105852786 - add Directo.send_receipts into whenever to generate cron jobs 2016-01-19 15:02:29 +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
Vladimir Krylov
30b057d535 Merge branch 'story/105852786-directo' into staging 
# Conflicts:
#	Gemfile
 2016-01-18 14:14:38 +02:00
Vladimir Krylov
49e66d33de Story#105852786 - Push bank transfers to directo 2016-01-18 14:13:28 +02:00
Vladimir Krylov
7ec5c0a501 Merge remote-tracking branch 'origin/story/109590460-ident-update' into staging 2016-01-18 13:18:12 +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
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
Vladimir Krylov
5959d4a419 Merge remote-tracking branch 'origin/104525318-history_import' into staging 2016-01-18 13:08:56 +02:00
Vladimir Krylov
326f4ad4ee 104525318 - default legacy legal docs conf 2016-01-18 11:17:14 +02:00
Vladimir Krylov
6ca72a26fe Story#105852786 - Directo product name is a setting now 2016-01-14 09:36:11 +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
Vladimir Krylov
cb6601ce1d Story#111396470 - show special message on contact ident update 2016-01-12 14:10:34 +02:00
Stas
bd65eb6494 110395650-separated_class_for_cron_jobs 2016-01-12 13:05:12 +02:00
Vladimir Krylov
c0f9a0105e Story#111065230 - send expiration_reminder Mail 2 days after 2016-01-06 17:30:05 +02:00
Timo Võhmar
a7ef011197 Merge pull request #47 from internetee/109809872-password_authinfo 
109809872 password authinfo
 2015-12-21 18:40:07 +02:00
Stas
6909f3d0ef 10729984-starting_balance 2015-12-18 13:30:51 +02:00
Matt Farnsworth
2c916001ad Story #109367018 - poll_pending_update_rejected_by_registrant typo 2015-12-16 20:37:21 +02:00
Timo Võhmar
fbe73c64b2 Merge pull request #37 from internetee/109163582-contact-filter 
109163582 contact filter
 2015-12-15 14:32:38 +02:00
Matt Farnsworth
613a34a2c5 Merge remote-tracking branch 'origin/105842700-registrants_portal' into 105846070-merge-with-105842700-arireg-for-registrant-port 2015-12-14 13:18:16 +02:00
Stas
2b186e9c93 105842700-translation_and_link_fix 2015-12-11 17:33:28 +02:00
Matt Farnsworth
310002f006 Story #105846070 - add message text for Soap::Arireg:NotAvailableError 2015-12-11 15:55:08 +02:00