Commit graph

6677 commits

Author SHA1 Message Date
Urban Rotnik
a7d351dc38 Add file size check 2019-10-22 14:13:22 +02:00
Alex Kriuchykhin
e333e7c44a
Merge pull request #2173 from biosistemika/release_1_17_4
Merge release 1.17.4 to master
2019-10-22 13:21:02 +02:00
Alex Kriuchykhin
5524598d53
Merge pull request #2172 from biosistemika/release_1_17_3
Merge release 1.17.3 to master
2019-10-22 12:45:02 +02:00
aignatov-bio
0ad824c28f Fix structure sql 2019-10-22 12:30:18 +02:00
aignatov-bio
9950a23188 Replace base64 avatars with url 2019-10-22 12:27:13 +02:00
Urban Rotnik
0119533e75 Fix for file generation 2019-10-22 11:02:59 +02:00
aignatov-bio
4d3e318174 Add check for existing elements 2019-10-22 10:46:16 +02:00
Alex Kriuchykhin
6d1ae38c59
Bump version to 1.17.4 2019-10-22 10:20:53 +02:00
aignatov-bio
aaf76c0526 Fix avatars in comments and activities 2019-10-22 09:54:36 +02:00
Urban Rotnik
ce9f1b1309 Add mceToken check 2019-10-22 08:28:35 +02:00
Alex Kriuchykhin
4f952a6523
Merge pull request #2167 from okriuchykhin/ok_SCI_4003
Fix issue with empty cells for xlsx inventory imports [SCI-4003]
2019-10-21 14:03:27 +02:00
Oleksii Kriuchykhin
6c57f56bf4 Fix issue with empty cells for xlsx inventory imports [SCI-4003] 2019-10-21 12:06:45 +02:00
Alex Kriuchykhin
61805cb837
Bump version to 1.17.3 2019-10-18 13:35:48 +02:00
Alex Kriuchykhin
95dced18fd
Merge pull request #2164 from okriuchykhin/ok_SCI_3999
Fix protocols table select all checkbox [SCI-3999]
2019-10-17 17:06:59 +02:00
Oleksii Kriuchykhin
4cba412e31 Fix protocols table select all checkbox [SCI-3999] 2019-10-17 17:05:01 +02:00
Alex Kriuchykhin
34f9e6265c
Merge pull request #2162 from okriuchykhin/ok_SCI_3990
Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993]
2019-10-17 17:03:11 +02:00
Alex Kriuchykhin
62cf439734
Merge pull request #2163 from biosistemika/SCI-3994-excel-import-to-inventory-fails-v2
SCI-3994 fix for excel import
2019-10-17 16:53:32 +02:00
Miha Mencin
0af8629f98 SCI-3994 fix for excel import 2019-10-17 14:37:11 +02:00
Oleksii Kriuchykhin
2637aed853 Fix code styling [SCI-3990][SCI-3993] 2019-10-17 13:38:36 +02:00
Oleksii Kriuchykhin
53402c9ce1 Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993] 2019-10-17 13:30:14 +02:00
Mojca Lorber
b78211e3ca Fix reloading of datatables header again 2019-10-16 13:02:41 +02:00
aignatov-bio
ba9edcdbe1
Merge pull request #2157 from aignatov-bio/ai-sci-3927-predefined-avatars
Fix avatar localization [SCI-3927]
2019-10-15 08:57:21 +02:00
Alex Kriuchykhin
50231b3c15
Merge pull request #2158 from okriuchykhin/ok_SCI_3991
Improve permission checking for reports [SCI-3991]
2019-10-14 15:14:10 +02:00
Oleksii Kriuchykhin
f3a6c18a84 Improve permission checking for reports [SCI-3991] 2019-10-14 14:50:05 +02:00
aignatov-bio
198697ff23 Fix avatar localization 2019-10-11 12:22:09 +02:00
aignatov-bio
5506d31d71
Merge pull request #2114 from aignatov-bio/ai-sci-3927-predefined-avatars
Add predefined avatars [SCI-3927]
2019-10-11 11:54:28 +02:00
aignatov-bio
54627faeb3 Fix tests 2019-10-11 11:46:51 +02:00
aignatov-bio
521a367960 Add predefined avatars 2019-10-11 11:46:51 +02:00
aignatov-bio
1f43f35073 First modal 2019-10-11 11:46:51 +02:00
Oleksii Kriuchykhin
8f52b362d6 Fix file handling in protocol import/copying [SCI-3935][SCI-3926][SCI-3934] 2019-10-11 11:46:51 +02:00
Miha Mencin
0aeeef85dc
Update version to 1.17.2 2019-10-10 16:41:57 +02:00
Alex Kriuchykhin
f6da6814b8
Merge pull request #2154 from okriuchykhin/ok_SCI_3977
Generate previews for newly created office files once asset is saved [SCI-3977]
2019-10-10 15:43:02 +02:00
Oleksii Kriuchykhin
07b037f05b Generate previews for newly created office files once asset is saved [SCI-3977] 2019-10-10 15:40:50 +02:00
Alex Kriuchykhin
48171f7e02
Merge pull request #2153 from okriuchykhin/ok_SCI_3977
Fix previews for newly created office files [SCI-3977]
2019-10-10 15:11:24 +02:00
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
Oleksii Kriuchykhin
0b4f72e517 Fix previews for newly created office files [SCI-3977] 2019-10-10 14:25:19 +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