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

11032 commits

Author SHA1 Message Date
ajugo bbe0aa29ea
Fix showing of project folder toolbar buttons [SCI-9099] (#6053) 
* Fix showing of project folder toolbar buttons [SCI-9099]

* Fix reading permission for all projects for team admins [SCI-9099]

* Fix check for team admin [SCI-9099]
 2023-08-23 18:05:20 +02:00
ajugo 207af995af
Fix display of tags on shareable task [SCI-8750] (#6059) 2023-08-23 18:04:01 +02:00
artoscinote 9f23fe557a
Add entity breadcrumbs to activity webhooks [SCI-9056] (#6056) 2023-08-23 16:49:17 +02:00
Alex Kriuchykhin 3c0389adc8
Make docx parser feature togglable [SCI-9094] (#6055) 2023-08-23 16:46:29 +02:00
wandji 207b302a03
Set margin for module protocol task content [SCI-9018] (#6044) 2023-08-23 15:59:11 +02:00
ajugo 63f0f5a307
Disable adding step_files for protocol parser [SCI-8993] (#5990) 2023-08-23 15:44:27 +02:00
Ivan Kljun 39ed4b1b92 Hide Cancel/Save btns after click at Share task modal [SCI-9008] 2023-08-23 14:20:24 +02:00
Alex Kriuchykhin b08a94ced6
Remove What's new section from user preferences section [SCI-9098] (#6046) 2023-08-23 13:12:06 +02:00
artoscinote e03920affd
Merge branch 'develop' into ma_SCI_8462 2023-08-23 11:21:32 +02:00
Martin Artnik 7abfa97224 Fix project public role picker [SCI-9084] 2023-08-23 11:00:58 +02:00
artoscinote e4ad77f00f
Merge pull request #6043 from G-Chubinidze/gc_SCI_7976 
Fixed gray background on tinymce crop button [SCI-7976]
 2023-08-22 16:35:59 +02:00
Giga Chubinidze 74c1691ae6 Fixed gray background on tinymce crop button 2023-08-22 18:33:09 +04:00
artoscinote f60243e424
Merge pull request #6041 from ivanscinote/SCI-9007-update-colors 
Fix 'Not started' status button at missing locations [SCI-9007]
 2023-08-22 15:19:05 +02:00
ivanscinote c8bc4bef01
Refactor new tab opening mechanism and update link options in TinyMCE v6 [SCI-8737] (#5866) 
Refactor new tab opening mechanism and update link options in TinyMCE v6 [SCI-8737]
 2023-08-22 14:59:34 +02:00
Ivan Kljun 28adb4956d Add 'Not started' btn to other views 2023-08-22 14:30:49 +02:00
ajugo 9de4d455a5
Merge pull request #6018 from wandji20/wb-SCI-9078 
Hide welcome modal after initial page load shareable links [SCI-9078]
 2023-08-22 14:10:57 +02:00
artoscinote 8ba9b2df6a
Merge pull request #6038 from artoscinote/ma_SCI_9084 
Fix visibility checkbox for project edit modal [SCI-9084]
 2023-08-22 12:25:34 +02:00
wandji20 87f7a74e02 Use shareable link uuid for setting session storage value [SCI-9078] 2023-08-22 11:21:05 +01:00
Martin Artnik 75bad0e8bc Fix visibility checkbox for project edit modal [SCI-9084] 2023-08-22 12:05:32 +02:00
wandji20 d46e80ba9b Hide welcome modal using sessionStorage after first page load of shared link [SCI-9078] 2023-08-22 10:59:02 +01:00
artoscinote ea3984776c
Merge pull request #6037 from artoscinote/ma_SCI_9084 
Fix edit project modal [SCI-9084]
 2023-08-22 11:06:14 +02:00
Martin Artnik 82f490b445 Fix edit project modal [SCI-9084] 2023-08-22 11:04:34 +02:00
Andrej 35ecd064d2 Fix tinymce help plugin language inclusion [SCI-9086] 2023-08-22 10:24:45 +02:00
Soufiane 6bce3b40df
FIX: Shared task fails to load sometimes [SCI-9052] (#6027) 2023-08-21 16:47:18 +02:00
wandji 1d051aeb0f
Fix CSS UI issues for shareable links task sharing [SCI-9080] (#6031) 
* Fix css UI issues for shareable links task sharing [SCI-9080]
 2023-08-21 16:07:38 +02:00
artoscinote 2e55181510
Merge pull request #6033 from artoscinote/ma_SCI_8994 
Fix issues with repository columns [SCI-8994][SCI-8846]
 2023-08-21 16:07:00 +02:00
Martin Artnik 5312ddbff6 Fix issues with repository columns [SCI-8994][SCI-8846] 2023-08-21 15:59:17 +02:00
Anton 0161277380 Fix bootstrap in report [SCI-9085] 2023-08-21 15:26:58 +02:00
artoscinote 8f24e90ee4
Merge pull request #6030 from wandji20/wb-SCI-9074 
Fix css issue protocol template author edit [SCI-9074]
 2023-08-21 12:58:23 +02:00
artoscinote 6f5ef60ab1
Merge pull request #5733 from G-Chubinidze/gc_SCI_8727 
Project card permission with not assigned team admin [SCI-8727]
 2023-08-21 12:19:28 +02:00
G-Chubinidze afdfec5f71
Update projects_service.rb 2023-08-21 14:13:00 +04:00
Giga Chubinidze a391e6e6e1 changed loop 2023-08-21 14:08:17 +04:00
artoscinote d8da463dc2
Merge pull request #5956 from ivanscinote/SCI-9008-share-task-modal 
Move blur event to whole modal at Share task [SCI-9008]
 2023-08-21 12:04:54 +02:00
wandji20 b41b0b04f0 Fix css issue protocol template author edit [SCI-9074] 2023-08-21 11:01:07 +01:00
artoscinote 00167e30b0
Merge pull request #6029 from artoscinote/ma_SCI_8422 
Fix filtering of template tags [SCI-8422]
 2023-08-21 11:56:28 +02:00
Ivan Kljun 5902ee28e1 Remove blur event function as it is redundant 2023-08-21 11:52:57 +02:00
Martin Artnik fc18c76efd Fix filtering of template tags [SCI-8422] 2023-08-21 11:44:01 +02:00
ajugo 95e6006c6a
Merge pull request #6026 from rekonder/aj_SCI_9077 
Fix scrolling of the shareable links layout [SCI-9077]
 2023-08-21 11:36:44 +02:00
aignatov-bio 58eaaf98b9
Merge pull request #6028 from aignatov-bio/ai-sci-8536-fix-long-task-names 
Fix long task names [SCI-8536]
 2023-08-21 11:18:53 +02:00
Anton d135c86f70 Fix long task names [SCI-8536] 2023-08-21 11:17:09 +02:00
artoscinote de61c37a4e
Merge pull request #5706 from wandji20/wb-SCI-8559 
Fix CSS Issues[SCI-8559]
 2023-08-21 11:05:38 +02:00
Andrej ef4d360be8 Fix scrolling of the shareable links layout [SCI-9077] 2023-08-21 10:38:54 +02:00
wandji20 5e6138fa18 Replace unecessary margin value with tailwind value [SCI-9018] 2023-08-21 09:27:28 +01:00
wandji20 0ae44eb3a7 Use default tailwind size for task assigned protocol description [SCI-9018] 2023-08-21 09:27:28 +01:00
wandji20 7c07befd3e Fix CSS issues in protocols, and quick start(new task) [SCI-9018] 2023-08-21 09:27:28 +01:00
aignatov-bio 33476403a5
Merge pull request #6025 from aignatov-bio/ai-sci-9085-fix-report-css 
Fix report css [SCI-9085]
 2023-08-21 10:12:31 +02:00
Anton ded0ac1b9f Fix report css [SCI-9085] 2023-08-21 09:54:35 +02:00
Ivan Kljun 022c2ee9de Merge remote-tracking branch 'upstream/develop' into SCI-9008-share-task-modal 2023-08-21 09:53:28 +02:00
Ivan Kljun 0553b5b0dc Merge remote-tracking branch 'upstream/develop' into SCI-9008-share-task-modal 2023-08-21 09:32:59 +02:00
sboursen-scinote ca35ad0122 Fix shared task view issues [SCI-9076] 
- Fix task header effects when selected
 2023-08-21 09:15:46 +02:00
Giga Chubinidze 3c588709be changed logic 2023-08-21 06:48:08 +04:00
artoscinote 3f754710ac
Merge pull request #6021 from ivanscinote/SCI-9007-update-colors 
Add .btn-not-started to task status flow modal [SCI-9007]
 2023-08-18 17:37:48 +02:00
Ivan Kljun f71c54dd74 Add .btn-not-started to task status flow modal [SCI-9007] 2023-08-18 17:21:26 +02:00
ajugo 6de239547e
Merge pull request #6020 from sboursen-scinote/sb_SCI-9019 
Table header not visible after creating a project/folder [SCI-9019]
 2023-08-18 16:34:15 +02:00
sboursen-scinote 2dc82c9ed9 Show table header in folder when creating the first project [SCI-9019] 2023-08-18 16:26:53 +02:00
Alex Kriuchykhin e3c23bd474
Merge pull request #6016 from sboursen-scinote/sb_SCI-9059 
Fix PDF report generation error [SCI-9059]
 2023-08-18 11:37:30 +02:00
Anton 37e1c46152 Hide result title in docx [SCI-9062] 2023-08-18 11:35:24 +02:00
sboursen-scinote 4d7fa93c06 Fix PDF report generation error [SCI-9059] 2023-08-18 11:23:49 +02:00
ajugo dcdbfefa91
Merge pull request #6011 from sboursen-scinote/sb_SCI-9066 
Fix small css issues [SCI-9066]
 2023-08-18 11:17:34 +02:00
Alex Kriuchykhin e9e15f015b
Merge pull request #6015 from okriuchykhin/ok_SCI_9079 
Fix move experiment modal form submission [SCI-9079]
 2023-08-18 11:13:10 +02:00
Oleksii Kriuchykhin c76fca0ab3 Fix move experiment modal form submission [SCI-9079] 2023-08-18 10:55:21 +02:00
Ivan Kljun 6918b3c568 Merge with develop and fix conflict [SCI-8928] 2023-08-18 10:54:07 +02:00
artoscinote 20c20012b2
Merge pull request #5863 from ivanscinote/SCI-8807-notifications 
Remove system notifications [SCI-8807]
 2023-08-18 10:28:05 +02:00
artoscinote 45791a764f
Merge pull request #6014 from wandji20/wb-SCI-9057 
Fix bug in new result table event delegation [SCI-9057]
 2023-08-18 10:13:36 +02:00
artoscinote 664819a7fc
Merge pull request #6008 from ivanscinote/SCI-9007-update-colors 
Update status and shared buttons design to Amanda [SCI-9007]
 2023-08-18 10:12:26 +02:00
artoscinote 35c0de4cef
Merge pull request #5882 from G-Chubinidze/gc_SCI_8933 
Fixed Inventory Calendar Header [SCI-8933]
 2023-08-18 10:07:32 +02:00
artoscinote c28b54c43b
Merge pull request #5937 from G-Chubinidze/gc_SCI_5605 
Some icons have the checkboard pattern applied to the background [SCI-5605]
 2023-08-18 10:04:06 +02:00
wandji20 cf3cb707fd Fix bug in new result table event delegation [SCI-9057] 2023-08-18 07:16:01 +01:00
sboursen-scinote a38158c788 Fix small css issues [SCI-9066] 2023-08-17 22:23:46 +02:00
Alex Kriuchykhin 67042ce254
Merge pull request #6003 from okriuchykhin/ok_SCI_9028 
Show only default label templates when feature is disabled [SCI-9028]
 2023-08-17 16:50:00 +02:00
artoscinote 2cc49ec6b5
Merge pull request #6005 from wandji20/wb-SCI-9003 
Fix CSS style issues [SCI-9003]
 2023-08-17 15:48:07 +02:00
Ivan Kljun e3f111debc Remove whitespace 2023-08-17 15:31:04 +02:00
Ivan Kljun b96dc345dd Apply hound linter suggestions 2023-08-17 15:29:22 +02:00
ajugo dd80b4019b
Merge pull request #5942 from sboursen-scinote/sb_SCI-8987 
Fix micro-interactions for shareable links modals [SCI-8987]
 2023-08-17 15:28:43 +02:00
sboursen-scinote ef9368d2cb Fix micro-interactions for shareable links modals [SCI-8987] 2023-08-17 15:22:16 +02:00
Ivan Kljun 400c1cb303 Update status and shared buttons design to Amanda [SCI-9007] 2023-08-17 15:18:46 +02:00
ajugo 032655f4e7
Merge pull request #6002 from rekonder/aj_SCI_8986 
Show toast message on successful copy [SCI-8986]
 2023-08-17 15:14:05 +02:00
Alex Kriuchykhin d81e2a0e47
Merge pull request #5995 from aignatov-bio/ai-sci-9062-hide-result-title-if-results-not-selected 
Hide results title if results not selected [SCI-9062]
 2023-08-17 14:58:21 +02:00
Anton 622a8766bb Hide results title if results not selected [SCI-9062] 2023-08-17 14:51:40 +02:00
Alex Kriuchykhin fd1b7885f4
Merge pull request #6006 from rekonder/aj_SCI_9064 
Add checks for metadata on protocol import [SCI-9064]
 2023-08-17 14:31:09 +02:00
Andrej b07432a444 Add checks for metadata on protocol import [SCI-9064] 2023-08-17 14:20:44 +02:00
wandji20 4a3f8146e3 Fix CSS style issues [wb-SCI-9003] 2023-08-17 13:11:58 +01:00
Alex Kriuchykhin c356018965
Merge pull request #5918 from sboursen-scinote/sb_SCI-8981 
Share button is disabled for locked and archived tasks [SCI-8981]
 2023-08-17 14:10:09 +02:00
Oleksii Kriuchykhin 14e49956f7 Show only default label templates when feature is disabled [SCI-9028] 2023-08-17 13:44:22 +02:00
Andrej 9a09fbc8ce Show toast message on successful copy [SCI-8986] 2023-08-17 11:21:53 +02:00
Oleksii Kriuchykhin 450f5df8ea Allow export of archived inventories [SCI-9060] 2023-08-17 11:20:26 +02:00
artoscinote 0082b858ec
Merge pull request #5983 from sboursen-scinote/sb_SCI-9042 
Add space after (A) in shareable links layout [SCI-9042]
 2023-08-17 09:00:01 +02:00
sboursen-scinote ffa6e8bc51 Add space after (A) in shareable links layout [SCI-9042] 2023-08-16 21:10:10 +02:00
wandji20 25e6cbdbd8 Move inline JavaScript inclusion for new and edit result table to result_tables.js [SCI-9057] 2023-08-16 17:08:25 +01:00
Alex Kriuchykhin 975a197716
Merge pull request #5987 from ivanscinote/SCI-9034-shared-task-issues 
Fix moment.js import and showing preview thumbnail img at shared task [SCI-9034]
 2023-08-16 15:34:57 +02:00
Alex Kriuchykhin 5eea990881
Merge pull request #5980 from wandji20/wb-SCI-9058 
Move new and edit result asset inline Javascript to result_asset.js  [SCI-9058]
 2023-08-16 15:34:21 +02:00
Ivan Kljun 1ea77b4ac8 Apply hound linter suggestions 2023-08-16 15:28:28 +02:00
Ivan Kljun 843cbb06da Fix trigger load and error event in active_storage_previews 2023-08-16 15:27:09 +02:00
Alex Kriuchykhin 66a72dff5f
Merge pull request #5989 from okriuchykhin/ok_SCI_8817_v2 
Improve handling of responses from protocols parser [SCI-8817]
 2023-08-16 14:52:56 +02:00
Alex Kriuchykhin 0c304ec80c
Merge pull request #5994 from okriuchykhin/ok_SCI_9053_v2 
Fix calls of user assignment propagation jobs with optional assigned_by [SCI-9053]
 2023-08-16 14:51:46 +02:00
wandji20 ebcb784149 Move result asset new and edit event handler to result asset and delete files [SCI-9058] 2023-08-16 13:50:40 +01:00
Oleksii Kriuchykhin 5e29523c61 Fix calls of user assignment propagation jobs with optional assigned_by [SCI-9053] 2023-08-16 14:34:42 +02:00
Anton 1d21b40479 Fix long project and task names in report [SCI-9061] 2023-08-16 14:16:54 +02:00
Anton 005779b3d3 Fix long project and task names in report [SCI-9061] 2023-08-16 14:12:47 +02:00
Oleksii Kriuchykhin 2ab559be97 Improve handling of responses from protocols parser [SCI-8817] 2023-08-16 13:26:41 +02:00