Commit graph

4268 commits

Author SHA1 Message Date
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
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
Stas
334e2b1362 113146419-script_changes 2016-03-04 17:20:34 +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
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
9e20fdc424 Story#113524121 - save_to_filesystem, if body is present 2016-03-04 14:46:16 +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
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
20c15e41b0 Story#105855968 - set directo min and max default settings 2016-03-04 14:17:04 +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
Stas
519c8908ee 113430903-precision_for_minutes 2016-03-03 20:59:28 +02:00
Stas
4fbb071e3e 113146419-new_task 2016-03-03 19:39:07 +02:00
Timo Võhmar
028fff88cd Merge pull request #95 from internetee/110412166-registrant_change
110412166 registrant change
2016-03-03 17:05:54 +02:00