scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
6464 commits 70 branches 179 tags 165 MiB
Commit graph

6464 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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