Commit graph

10588 commits

Author SHA1 Message Date
ajugo 2f5015e2a2
Fix error at adding consumption to assigned item to task [SCI-8868] (#5789) 2023-07-17 15:42:40 +02:00
ajugo d71351fcbc
Fix scrollTo for inventory filter [SCI-8869] (#5782) 2023-07-17 15:39:19 +02:00
wandji 2698681548
Fix Not correct naming for label in global activity filter (#5776)
* Update translation for label_repository and sort template label names in label print modal

* Rename label_repository to label_templates in translation file and initializer/extends) [SCI-8808]
2023-07-17 15:38:28 +02:00
Soufiane 5736c444f6
Remove not used code for global activities [SCI-4851] (#5773)
* Fix broken task/activity [SCI-4851]

* Remove unused code for global activities [SCI-4851]
2023-07-17 15:36:22 +02:00
Soufiane 3775727857
Fix project export issue [SCI-8827] (#5767) 2023-07-17 15:33:02 +02:00
aignatov-bio c1a6370e49
Merge pull request #5780 from aignatov-bio/ai-sci-8788-fix-checklists-button-position
Fix checklist add item button position [SCI-8788]
2023-07-17 15:30:58 +02:00
wandji 063c1209ba
Fix issue when viewing task repository snapshot [SCI-8871] (#5785) 2023-07-17 13:15:04 +02:00
aignatov-bio 18f4b2cc19
Merge pull request #5787 from aignatov-bio/ai-sci-8855-fix-preview-generation
Fix preview generation [SCI-8855]
2023-07-17 13:09:38 +02:00
Anton bd1e81f894 Fix preview generation [SCI-8855] 2023-07-17 13:05:33 +02:00
Soufiane 1dfc46e995
Fix comments update action [SCI-8873] (#5786) 2023-07-17 13:04:56 +02:00
Anton 5b989042f0 Fix checklist add item button position [SCI-8788] 2023-07-17 11:00:32 +02:00
ajugo 504a0bee62
Fix scroll for protocols.io [SCI-8825] (#5774) 2023-07-17 10:55:36 +02:00
wandji ebe1bd583f
Fix issue json response for creating result table [SCI-8853] (#5768)
* Fix issue json resposnse for creating result table [SCI-8853]

* Fix linter errors [SCI-8853]

* Fix linter errors [SCI-8853]

* Fix issues when editing and updating results text/table for task [SCI-8853]

* Fix linter errors [SCI-8853]
2023-07-14 12:30:36 +02:00
Soufiane 5266fad02d
Fix bootstrap input-group style [SCI-8723] (#5770) 2023-07-14 08:37:29 +02:00
aignatov-bio 9421ef3312
Merge pull request #5764 from aignatov-bio/ai-sci-8788-fix-styling-for-checklist-items
Fix css for protocol checklists [SCI-8788]
2023-07-13 15:09:57 +02:00
Anton b623cf8d04 Fix canvas styling [SCI-8789] 2023-07-13 14:21:55 +02:00
Anton 4cc6513f82 Fix css for protocol checklists [SCI-8788] 2023-07-13 13:55:32 +02:00
Oleksii Kriuchykhin fca9aea4a8 Merge branch 'features/rails-upgrade' into develop 2023-07-13 13:10:59 +02:00
Soufiane 78d8a54e0d
Remove BMT and bioeddie from Scinote [SCI-8643] (#5760) 2023-07-13 09:45:53 +02:00
Soufiane 6d98b0c235
Reports - Issues after rails upgrade [SCI-8830] (#5758)
* Fix reports issues after rails upgrade [SCI-8830]

* Fix report image assets [SCI-8830]
2023-07-12 15:42:34 +02:00
aignatov-bio c90060dbec
Merge pull request #5757 from aignatov-bio/ai-sci-8762-css-fixes
Multiple CSS fixes [SCI-8762]
2023-07-12 14:34:59 +02:00
Anton 24454a0fb9 Multiple CSS fixes [SCI-8762] 2023-07-12 12:25:31 +02:00
G-Chubinidze ac399e5722
Activities - Issues after rails upgrade [SCI-8824] (#5755) 2023-07-12 11:11:10 +02:00
Soufiane 2f669c93d5
Fix projects issues after rails upgrade [SCI-8827] (#5754) 2023-07-12 11:10:17 +02:00
aignatov-bio 683fe22475
Merge pull request #5753 from aignatov-bio/ai-sci-8716-fix-checklists-drag-n-drop-interactions
Fix checklists drag/drop interactions in Safari [SCI-8716]
2023-07-12 09:48:27 +02:00
ajugo 051e686787
Implement automatic check for new notifications [SCI-8654] (#5631) 2023-07-11 16:05:34 +02:00
Alex Kriuchykhin b852cf92fe
Fix displaying of tinyMCE images in search results [SCI-8823] (#5751) 2023-07-11 14:47:15 +02:00
Anton 71020c032d Fix checklists drag/drop interactions in Safari [SCI-8716] 2023-07-11 13:42:08 +02:00
aignatov-bio 388915b6d9
Fix big decimal number renderer in repository [SCI-8828] (#5746) 2023-07-11 13:24:07 +02:00
aignatov-bio 3de911d714
Merge pull request #5750 from aignatov-bio/ai-sci-8762-css-bugs
CSS fixes [SCI-8762]
2023-07-11 10:59:27 +02:00
Soufiane a1e32e0c3d
Profile - 2FA error page [SCI-8779] (#5734)
* Fix 2FA form submit [SCI-8779]
2023-07-11 09:22:42 +02:00
Soufiane d8658991d6
Fix task page issues after rails upgrade [SCI-8821] (#5745) 2023-07-11 09:21:22 +02:00
Soufiane 6aaa68f320
Fix reports issues after rails upgrade [SCI-8830] (#5748) 2023-07-11 09:20:29 +02:00
Anton 8e1836aa82 CSS fixes [SCI-8762] 2023-07-10 21:09:29 +02:00
artoscinote 5bcf31ed2e
Fix activity filter loading via URL params [SCI-7537] (#5737) 2023-07-10 13:59:15 +02:00
Soufiane e8c62d6cd8
Fix protocol template issues after rails upgrade [SCI-8822] (#5740) 2023-07-10 13:57:13 +02:00
Soufiane eb4d0f2065
Revert changing .js.erb file [SCI-8810] (#5741) 2023-07-10 09:43:00 +02:00
Soufiane b44678d09a
Switch to keyword parameters in i18n.t [SCI-8810] (#5739) 2023-07-07 14:55:51 +02:00
Alex Kriuchykhin 97a16f2e76
Fix archived columns behaviour in repositories export [SCI-8777] (#5728) 2023-07-07 11:08:28 +02:00
Soufiane 8fb14645bf
Match protocol template print permissions to show [SCI-8803] (#5726) 2023-07-07 11:01:31 +02:00
wandji 322346c8e4
Fix dropdown issue for filters [SCI_8781] (#5731) 2023-07-07 10:58:43 +02:00
Martin Artnik ed4af7ae26 Properly unload scroll listener when unloading a select [SCI-8802] 2023-07-06 10:31:26 +02:00
ajugo c8c0a147b5
Revert "Unified paddings for collapsing content at printers pages [SCI-8787] (#5718)" (#5719)
This reverts commit dbb0e1a50a.
2023-07-05 14:20:22 +02:00
ivanscinote dbb0e1a50a
Unified paddings for collapsing content at printers pages [SCI-8787] (#5718)
* Unified paddings for collapsing content at printers pages

* Reordered css values as per bot-hound suggestion
2023-07-05 14:19:23 +02:00
Soufiane ea6a714dac
Disallow scripts loading over https [SCI-8634] (#5713)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-07-05 13:19:16 +02:00
Alex Kriuchykhin 5f1c6bf2f0
Fix multiple issues after Rails upgrade [SCI-8780] (#5716) 2023-07-05 12:43:23 +02:00
artoscinote 85ad167998
Merge pull request #5660 from artoscinote/ma_SCI_8506
Make label print modal work globally [SCI-8506]
2023-07-05 09:53:56 +02:00
artoscinote 1c337b7dd6
Merge pull request #5704 from artoscinote/ma_SCI_8774
Fix result table editing [SCI-8774]
2023-07-03 13:32:35 +02:00
Martin Artnik 308079319c Fix result table editing [SCI-8774] 2023-07-03 13:28:34 +02:00
ajugo 6dc4b646c5
Add handling for deleted ActiveStorage files [SCI-8264] (#5624)
Add handling for deleted ActiveStorage files [SCI-8264]
2023-07-03 13:13:19 +02:00