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 |
|
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
|
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 |
|
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 |
|
Vladimir Krylov
|
7d877c89e9
|
Merge branch '113524121-legal_doc_min_size' into staging
|
2016-03-07 12:23:30 +02:00 |
|
Vladimir Krylov
|
c772ef00d6
|
Story#113524121 - we have new rails, so we should use data-legal-document
|
2016-03-07 12:23:19 +02:00 |
|
Vladimir Krylov
|
6dd4e14f05
|
Merge branch '113524121-legal_doc_min_size' into staging
|
2016-03-07 12:16:39 +02:00 |
|
Vladimir Krylov
|
907da3d08e
|
Story#113524121 - update assets
|
2016-03-07 12:16:13 +02:00 |
|
Vladimir Krylov
|
08fd54792e
|
Merge branch '113524121-legal_doc_min_size' into staging
|
2016-03-07 12:00:51 +02:00 |
|
Vladimir Krylov
|
cf3fce8055
|
Story#113524121 - validate in web max file
|
2016-03-07 12:00:23 +02:00 |
|
Vladimir Krylov
|
c87b8e7f4d
|
Merge branch '104525318-history_import' into staging
|
2016-03-07 11:26:42 +02:00 |
|
Vladimir Krylov
|
8e2e02a882
|
Story#111397154 - show old path in logs if file is missing
|
2016-03-07 11:17:53 +02:00 |
|
Vladimir Krylov
|
6870de87ab
|
Merge branch '104525318-history_import' into staging
|
2016-03-04 16:28:22 +02:00 |
|
Vladimir Krylov
|
813464c91d
|
Story#111397154 - if during import file is not present, then just notify
|
2016-03-04 16:28:13 +02:00 |
|
Vladimir Krylov
|
ef262361d4
|
Merge branch '104525318-history_import' into staging
|
2016-03-04 16:24:01 +02:00 |
|
Vladimir Krylov
|
9806243553
|
Story#111397154 - if during import file is not present, then just notify
|
2016-03-04 16:23:44 +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
|
9e20fdc424
|
Story#113524121 - save_to_filesystem, if body is present
|
2016-03-04 14:46:16 +02:00 |
|
Vladimir Krylov
|
7ca5195ca3
|
Merge branch '113524121-legal_doc_min_size' into staging
|
2016-03-04 14:33:25 +02:00 |
|
Vladimir Krylov
|
6f4ff0fd46
|
Story#113524121 - change validation that legal document body is not valid only if path is not set
|
2016-03-04 14:33:06 +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
|
4696db1447
|
Merge remote-tracking branch 'origin/104525318-history_import' into staging
|
2016-03-04 14:17:34 +02:00 |
|
Vladimir Krylov
|
75c6cf8297
|
Story#111397154 - Legal documents do not have upated_At attribute
|
2016-03-04 14:14:47 +02:00 |
|
Stas
|
a489211e97
|
Merge branch '113430903-delete_candidate_randomizer' into staging
|
2016-03-04 12:48:31 +02:00 |
|
Stas
|
aa1e08942b
|
113430903-minutes_added_for_condition
|
2016-03-04 12:47:39 +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
|
0d2480a79a
|
Merge branch '105842700-registrants_portal' into staging
|
2016-03-04 12:42:36 +02:00 |
|
Vladimir Krylov
|
21896c35df
|
Story#105842700 - Legal doc is already saved at this point and sometimes path is not official
|
2016-03-04 12:42:19 +02:00 |
|
Stas
|
496b000592
|
Merge branch '113430903-delete_candidate_randomizer' into staging
|
2016-03-03 21:00:09 +02:00 |
|