Commit graph

4300 commits

Author SHA1 Message Date
Vladimir Krylov
2935101d95 Merge branch '105842700-registrants_portal' into staging 2016-03-11 14:20:11 +02:00
Vladimir Krylov
1bf7315a91 Story#113525877 - Change state check from pendingDelete to pendingDeleteConfirmation 2016-03-11 14:19:48 +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
519046064d Story#105855968 - Exclude registrars in directo monthly invoices 2016-03-11 11:23:11 +02:00
Vladimir Krylov
74b3b5d5a3 Merge branch '113524121-legal_doc_min_size' into staging 2016-03-11 09:57:54 +02:00
Vladimir Krylov
f638d56281 remove assets 2016-03-11 09:57:43 +02:00
Vladimir Krylov
c292bc5a25 Story#113524121 - min legal document size is 8kB 2016-03-11 09:56:50 +02:00
Timo Võhmar
2c059f9176 Merge pull request #102 from internetee/story/115147999-assets
Story/115147999 assets
2016-03-10 16:22:00 +02:00
Timo Võhmar
e2380b7df6 Merge branch 'doc_contact_charset' 2016-03-10 15:10:33 +02:00
Timo Võhmar
e509ecabb4 Merge branch 'doc_contact_charset' into staging 2016-03-10 15:06:47 +02:00
Timo Võhmar
0727312426 missing . 2016-03-10 15:05:42 +02:00
Timo Võhmar
5f01426fea Merge branch 'doc_contact_charset' into staging 2016-03-10 15:00:48 +02:00
Timo Võhmar
77b6a26daf Specified supported charsets in the doc for contact objects 2016-03-10 14:11:34 +02:00
Timo Võhmar
30697a3b6d Merge pull request #101 from internetee/story/113066359-optimization
Story/113066359 optimization
2016-03-10 13:22:54 +02:00
Timo Võhmar
57f77196da Merge pull request #100 from internetee/story/115042421-expire-pending
Story#115042421 - we don't need here deliver email variable as sendin…
2016-03-09 16:03:48 +02:00
Timo Võhmar
9fe4399501 Merge pull request #99 from internetee/113911147-whois_update_for_cron
113911147-whois_update
2016-03-09 14:40:28 +02:00
teadur
50b70cb595 Merge pull request #98 from internetee/master-gemupdates
Master gemupdates
2016-03-09 13:21:13 +02:00
Vladimir Krylov
43cb1a443c Story#115147999 - set mina script 2016-03-09 13:16:13 +02:00
Vladimir Krylov
9554d4583b Merge branch 'story/114871365-address-cc-upcase' into staging 2016-03-08 15:48:38 +02:00
Vladimir Krylov
3615f4dd8b Story#114871365 - add rake task to update contacts country code (typo) 2016-03-08 15:48:26 +02:00
Vladimir Krylov
6576f19206 Merge branch 'story/114871365-address-cc-upcase' into staging 2016-03-08 15:47:12 +02:00
Vladimir Krylov
d18fb5e6be Story#114871365 - add rake task to update contacts country code 2016-03-08 15:46:48 +02:00
Vladimir Krylov
65f6b4b43e Story#114871365 - add address country_code validation 2016-03-08 15:06:53 +02:00
Vladimir Krylov
0e9ddd3c4d Merge remote-tracking branch 'origin/staging' into staging 2016-03-08 13:58:00 +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
dbe1965731 Story#115147999 - use digested assets 2016-03-08 11:19:56 +02:00
Georg Kahest
d1f019a1b9 rails to 4.2.5.2 2016-03-08 11:17:29 +02:00
Georg Kahest
ceb91033a6 dont generate assets on the fly 2016-03-08 11:17:29 +02:00
Georg Kahest
e40d3b9b80 rails/activerecords and deps 2016-03-08 11:17:29 +02:00
Georg Kahest
5de25390d6 security updates for other gems 2016-03-08 11:17:08 +02:00
teadur
6311277328 Merge pull request #97 from internetee/gem-updates
rails to 4.2.5.2
2016-03-08 11:03:59 +02:00
Georg Kahest
248d7e07df rails to 4.2.5.2 2016-03-08 11:01:57 +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
8f5a73a3ec 108869472-navigayion_list_added 2016-03-07 18:07:11 +02:00
Stas
1a580d7332 translations merge fix 2016-03-07 15:23:19 +02:00
Stas
ce06a95274 113146419-step_size_changed 2016-03-07 15:00:10 +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
Vladimir Krylov
89bad6b888 Merge branch 'story/115042421-expire-pending' into staging 2016-03-07 14:11:04 +02:00
Vladimir Krylov
8d2fc88290 Story#115042421 - we don't need here deliver email variable as sending always 2016-03-07 14:10:38 +02:00
Stas
a71a4dd507 Merge branch '105842700-registrants_portal' into staging 2016-03-07 13:55:20 +02:00
Stas
fe4aa3f0b3 105842700-method_for_verification_url 2016-03-07 13:53:13 +02:00
Vladimir Krylov
c340c8f938 Merge branch '113524121-legal_doc_min_size' into staging 2016-03-07 13:28:24 +02:00
Vladimir Krylov
7b5c13a97a Story#113524121 - more pure-js (compile assets) 2016-03-07 13:27:59 +02:00
Vladimir Krylov
dbe157406f Merge branch '113524121-legal_doc_min_size' into staging 2016-03-07 13:08:53 +02:00
Vladimir Krylov
8406651543 Story#113524121 - more pure-js (compile assets) 2016-03-07 13:08:37 +02:00
Vladimir Krylov
780d4c4968 Merge branch '113524121-legal_doc_min_size' into staging 2016-03-07 13:06:33 +02:00
Vladimir Krylov
f9d55f2675 Story#113524121 - more pure-js 2016-03-07 13:06:19 +02:00