Commit graph

6441 commits

Author SHA1 Message Date
Alex Kriuchykhin
9af474134d
Merge pull request #2152 from aignatov-bio/ai-sci-3984-generate-all-preview-for-asset-same-time
Generate all preview for assets at same time [SCI-3984]
2019-10-10 14:29:56 +02:00
aignatov-bio
9d59d56818 Generate all preview for assets at same time 2019-10-10 14:17:02 +02:00
Miha Mencin
042d5eab65
Update version to 1.17.1 2019-10-09 18:58:21 +02:00
Miha Mencin
e68b8f55c2
skip individual checking 2019-10-09 18:00:06 +02:00
Miha Mencin
2ef095b003
Additional check for attached workflowimages 2019-10-09 17:17:33 +02:00
Alex Kriuchykhin
e6e94d5784
Merge pull request #2150 from okriuchykhin/ok_SCI_3949_v2
Rename prepared statement for experiment files migration [SCI-3949]
2019-10-09 17:06:55 +02:00
Oleksii Kriuchykhin
de33cb5751 Rename prepared statement for experiment files migration [SCI-3949] 2019-10-09 17:04:43 +02:00
Alex Kriuchykhin
28dd5682f7
Merge pull request #2149 from okriuchykhin/ok_SCI_3949_v2
Add AS migration for existing experiment images [SCI-3949]
2019-10-09 16:55:39 +02:00
Oleksii Kriuchykhin
75ed617e34 Add AS migration for existing experiment images [SCI-3949] 2019-10-09 16:47:32 +02:00
Miha Mencin
7b29f2bbc7
Merge pull request #2148 from biosistemika/revert-2147-ok_SCI_3949
Revert "Handle missing experiment previews [SCI-3949]"
2019-10-09 16:42:27 +02:00
Miha Mencin
e2b5989c14
Revert "Handle missing experiment previews [SCI-3949]" 2019-10-09 16:42:15 +02:00
Alex Kriuchykhin
71aa8e646e
Merge pull request #2147 from okriuchykhin/ok_SCI_3949
Handle missing experiment previews [SCI-3949]
2019-10-09 16:27:16 +02:00
Miha Mencin
95099ee6a4
Merge pull request #2146 from biosistemika/SCI-3979
SCI-3979 removing accessors
2019-10-09 16:25:20 +02:00
Oleksii Kriuchykhin
00921a5f6a Hadle missing experiment previews [SCI-3949] 2019-10-09 16:24:21 +02:00
Miha Mencin
8e98c82bbf SCI-3979 removing accessors 2019-10-09 15:49:49 +02:00
Miha Mencin
a753c5b87e
Update VERSION to 1.17.0 2019-10-09 12:33:47 +02:00
Alex Kriuchykhin
2ec7f9c379
Merge pull request #2143 from okriuchykhin/ok_SCI_3949
Add paperclip for backward compatibility [SCI-3949]
2019-10-09 10:39:26 +02:00
Oleksii Kriuchykhin
ab395f46d0 Add paperclip for backward compatibility [SCI-3949] 2019-10-09 10:28:02 +02:00
Miha Mencin
b2215ffa76
Merge pull request #2142 from biosistemika/remove-virtual-attributes-on-assets
Remove paperclip attribute accessors
2019-10-09 10:20:17 +02:00
Miha Mencin
6d71036d07
Remove paperclip attribute accessors 2019-10-09 10:20:00 +02:00
Miha Mencin
6354ab1482
Merge pull request #2141 from biosistemika/revert-2138-ai-sci-fix-report-in-academia
Revert "Fix report in academia"
2019-10-09 10:16:57 +02:00
Miha Mencin
78fd5df0f6
Revert "Fix report in academia" 2019-10-09 10:16:39 +02:00
Miha Mencin
37e6604f8b
Merge pull request #2136 from biosistemika/SCI-3975-team-export
Sci 3975 team export
2019-10-08 21:47:08 +02:00
Miha Mencin
fa871bf56e Merge branch 'SCI-3975-team-export' of github.com:biosistemika/scinote-web into SCI-3975-team-export 2019-10-08 21:42:13 +02:00
Miha Mencin
f12c29bd2a fixing import 2019-10-08 21:40:44 +02:00
aignatov-bio
53adea97ea
Merge pull request #2140 from biosistemika/revert-2139-ai-sci-fix-office-save
Revert "Force save office file"
2019-10-08 21:34:35 +02:00
aignatov-bio
5eed152403
Revert "Force save office file" 2019-10-08 21:34:16 +02:00
aignatov-bio
0d88466894
Merge pull request #2139 from aignatov-bio/ai-sci-fix-office-save
Force save office file
2019-10-08 21:11:33 +02:00
aignatov-bio
236ce30254 Force save office file 2019-10-08 21:10:18 +02:00
aignatov-bio
4a5db36c07
Merge pull request #2138 from aignatov-bio/ai-sci-fix-report-in-academia
Fix report in academia
2019-10-08 20:19:48 +02:00
aignatov-bio
5d80c51996 Fix report in academia 2019-10-08 20:18:51 +02:00
aignatov-bio
65ab3c421a
Merge pull request #2137 from aignatov-bio/ai-sci-fix-async-request-for-multiple-result
Fix async assets results
2019-10-08 19:52:04 +02:00
aignatov-bio
a930f7affd Fix async assets results 2019-10-08 19:51:03 +02:00
Miha Mencin
c673c3960f removin uneeded stuff left there by supidity 2019-10-08 17:23:46 +02:00
Miha Mencin
4f290cacfc remove the unneeded require 2019-10-08 16:22:48 +02:00
Miha Mencin
de89a97e0a Merge branch 'master' of github.com:biosistemika/scinote-web into SCI-3975-team-export 2019-10-08 16:20:40 +02:00
Miha Mencin
5f16926280 SCI-3976 different approach to file download 2019-10-08 16:20:16 +02:00
Alex Kriuchykhin
6e6ed84014
Merge pull request #2135 from okriuchykhin/ok_SCI_3949
Update sassc gem version to 2.2.1 [SCI-3949]
2019-10-08 14:33:36 +02:00
Oleksii Kriuchykhin
f18941ea19 Update sassc gem version to 2.2.1 [SCI-3949] 2019-10-08 14:32:25 +02:00
Alex Kriuchykhin
f82d02b5d0
Merge pull request #2134 from okriuchykhin/ok_SCI_3960
Fix team deletion script [SCI-3960]
2019-10-08 13:35:07 +02:00
Alex Kriuchykhin
6306691cfe
Merge pull request #2133 from okriuchykhin/ok_SCI_3959
Implement JPEG quality extraction for ActiveStorage [SCI-3959]
2019-10-08 13:34:57 +02:00
Oleksii Kriuchykhin
6908a5c3a3 Fix team deletion script [SCI-3960] 2019-10-08 12:04:47 +02:00
Oleksii Kriuchykhin
2608f3f1cf Improve code readability [SCI-3959] 2019-10-08 11:43:45 +02:00
Oleksii Kriuchykhin
3d9c2282f3 Implement JPEG quality extraction for ActiveStorage [SCI-3959] 2019-10-08 10:42:55 +02:00
Alex Kriuchykhin
b752f32444
Merge pull request #2131 from okriuchykhin/ok_SCI_3970
Change default executable name for LibreOffice [SCI-3970]
2019-10-07 16:50:09 +02:00
aignatov-bio
4439ffce6c
Merge pull request #2132 from aignatov-bio/ai-sci-3676-fix-tinymce-import-from-eln
Fix TinyMCE import from .eln [SCI-3972]
2019-10-07 16:48:58 +02:00
aignatov-bio
f9497e2e3e Fix TinyMCE import from ELN 2019-10-07 16:21:11 +02:00
Oleksii Kriuchykhin
8b3c042e39 Change default executable name for LibreOffice [SCI-3970] 2019-10-07 16:13:43 +02:00
Alex Kriuchykhin
39a2669eef
Merge pull request #2129 from okriuchykhin/ok_SCI_3950
Improve missing files handling when clonning TinyMceAsset [SCI-3950]
2019-10-07 09:18:45 +02:00
Oleksii Kriuchykhin
a2d70afeca Improve missing files handling when clonning TinyMceAsset [SCI-3950] 2019-10-04 15:59:22 +02:00