zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-18 10:19:45 +02:00
Code Issues Projects Releases Packages Wiki Activity
4268 commits 274 branches 267 tags 136 MiB
Commit graph

855 commits

Author SHA1 Message Date
Vladimir Krylov
4f458adb0f Merge branch 'story/105855968-directo' into staging 
# Conflicts:
#	config/locales/en.yml
 2016-03-21 12:20:33 +02:00
Vladimir Krylov
d67db2d7c8 Story#105855968 - admin/show mark if registrar is test 2016-03-21 12:18:48 +02:00
Vladimir Krylov
92605d7a08 Merge branch '111864739-history_legal_doc' into staging 
# Conflicts:
#	app/models/legal_document.rb
 2016-03-18 16:00:32 +02:00
Vladimir Krylov
71aae06dd1 Story#111864739 - epp validation 2016-03-18 15:59:14 +02:00
Vladimir Krylov
0779657b41 Merge branch 'story/105855968-directo' into staging 
# Conflicts:
#	config/locales/en.yml
 2016-03-16 17:51:06 +02:00
Vladimir Krylov
60c9a0a766 Story#105855968 - show Registrar#test_registrar in admin/registrars 2016-03-16 17:50:19 +02:00
Vladimir Krylov
754fb7c9e5 Merge branch '105842700-registrants_portal' into staging 2016-03-16 13:55:49 +02:00
Vladimir Krylov
f4e068de12 Story#105842700 - we don't need registrant views in registrant portal as it's usual contact 2016-03-16 13:53:11 +02:00
Stas
a80a24ee05 Merge branch '108869472-objects_archive' into staging 2016-03-14 14:00:59 +02:00
Stas
a42049e170 108869472-template_changes 2016-03-14 13:54:00 +02:00
Vladimir Krylov
7d8cc9839f Merge branch 'story/105855968-directo' into staging 
# Conflicts:
#	Gemfile
#	Gemfile.lock
 2016-03-11 11:26:14 +02:00
Vladimir Krylov
acfc6dccce Merge branch 'story/115147999-assets' into staging 
# Conflicts:
#	public/assets/.sprockets-manifest-48c2dd3ff16b86b70040480e74a50543.json
#	public/assets/registrant-manifest.js
#	public/assets/registrar-manifest.css
#	public/assets/registrar-manifest.js
#	public/assets/registrar/application.js
 2016-03-08 13:57:44 +02:00
Vladimir Krylov
05e603aa9d Story#115147999 - set mina script 2016-03-08 13:06:00 +02:00
Vladimir Krylov
6344c2c6a2 Merge branch 'story/115147999-assets' into staging 2016-03-08 10:32:53 +02:00
Vladimir Krylov
e4c340740e Story#115147999 - use digested assets 2016-03-08 10:29:14 +02:00
Stas
1a580d7332 translations merge fix 2016-03-07 15:23:19 +02:00
teadur
c8229c561e Merge pull request #96 from internetee/gem-updates 
dont generate assets on the fly
 2016-03-07 14:58:35 +02:00
Georg Kahest
59578f8eba dont generate assets on the fly 2016-03-07 14:57:39 +02:00
Stas
a71a4dd507 Merge branch '105842700-registrants_portal' into staging 2016-03-07 13:55:20 +02:00
Vladimir Krylov
ef55560d0e Story#105855968 - send invoices to directo 2016-03-04 16:15:30 +02:00
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
b76fb8c9ff Merge remote-tracking branch 'origin/master' into story/105855968-directo 2016-03-04 14:34:40 +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
20c15e41b0 Story#105855968 - set directo min and max default settings 2016-03-04 14:17:04 +02:00
Vladimir Krylov
6f0360bae6 Merge remote-tracking branch 'origin/master' into 105842700-registrants_portal 
# Conflicts:
#	config/locales/en.yml
 2016-03-04 12:44:16 +02:00
Vladimir Krylov
3d180ec45a Merge remote-tracking branch 'origin/master' into 110412166-registrant_change 2016-03-03 17:04:19 +02:00
Vladimir Krylov
e954c212c7 Story#105855968 - Prepare xml for Directo 2016-03-03 15:52:42 +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