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
13576 commits 70 branches 179 tags 165 MiB
Commit graph

10648 commits

Author SHA1 Message Date
artoscinote a8a631bf72
Merge pull request #5784 from sboursen-scinote/sb_SCI-8866-8867 
Fix smart annotation popover URL [SCI-8866][SCI-8867]
 2023-07-18 08:16:35 +02:00
Giga Chubinidze 1982143608 Clunky parts: button initialization when P/E/T view is changed [SCI-8663] 2023-07-18 01:50:05 +04:00
ivanscinote 6300c1bef8
Fix smart annotations multiline display [SCI-8816] (#5790) 2023-07-17 16:20:49 +02:00
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
sboursen-scinote 3167a3ca8f Fix smart annotation popover url [SCI-8866][SCI-8867] 2023-07-17 12:06:52 +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
Giga Chubinidze 6bc2efbcde CSS: Inventories filter input width [SCI-8791] 2023-07-17 11:50:52 +04:00
wandji20 3ee5049654 Fix issue archiving task result tables and when downloading archived tables [SCI-8851] 2023-07-15 11:33:44 +01: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
wandji20 a63e6f20b4 Remove redundant check [SCI-8744] 2023-07-13 18:28:51 +01:00
wandji20 8bacfa4158 Set blank default date for added_on repository filters(Fix llinter errors) [SCI-8744] 2023-07-13 18:28:51 +01:00
wandji20 20fb1e9285 Set blank default date for added_on repository filters(Fix llinter errors) [SCI-8744] 2023-07-13 18:28:51 +01:00
wandji20 973d65ca00 Set blank default date for added_on repository filters [SCI-8744] 2023-07-13 18:28:51 +01: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
Martin Artnik c7d992ab83 Fixes for saving of result table metadata [SCI-8774] 2023-07-03 12:35:29 +02:00
Martin Artnik 0f3b524492 Fix and amend result table metadata saving [SCI-8774] 2023-06-30 14:11:03 +02:00
Anton 3e3374c83d Fix service module 2023-06-29 14:38:13 +02:00
Oleksii Kriuchykhin e5fe82a297 Fix file name of inventory export, add archived columns to exports [SCI-8760] 2023-06-28 10:22:26 +02:00
Anton 586d9eaf4b CSS fixes [SCI-8758][SCI-8759] 2023-06-27 20:31:25 +02:00
Martin Artnik 39aedd86e0 Fix project sort initialization [SCI-8756] 2023-06-27 15:18:12 +02:00
aignatov-bio 272baeb93e
Merge pull request #5680 from aignatov-bio/ai-sci-8742-small-css-fixes 
Small css fixes [SCI-8742]
 2023-06-27 12:00:37 +02:00
Anton e2190cedde Small css fixes [SCI-8742] 2023-06-27 11:58:02 +02:00
Andrej 35ebbadae9 Fix adding tags to the task at creation [SCI-8745] 2023-06-27 10:52:03 +02:00
ajugo 8d29e606d0
Fix filtering of the member on project page [SCI-8743] (#5676) 2023-06-27 10:17:17 +02:00
artoscinote 5fe463d293
Merge pull request #5674 from sboursen-scinote/sb_SCI-8164-8726 
[SCI-8164][SCI-8726]
 2023-06-26 15:43:29 +02:00
sboursen-scinote 706c2e492b Fix CSS and icon inconsistencies [SCI-8164][SCI-8726] 
- Use the correct arrow-left/arrow-right icons.
- Show the tasks of active experiments in archived branch in the Navigator.
- Fix minor style issues in P/E/T.

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-26 15:22:36 +02:00
artoscinote fa60cb6589
Merge pull request #5664 from G-Chubinidze/gc_SCI_8476 
Breadcrumbs on label/protocol template page [SCI-8476]
 2023-06-26 13:00:19 +02:00
artoscinote ec3e8a20cc
Merge pull request #5671 from sboursen-scinote/sb_SCI-8729 
Archived view broken after folder [SCI-8729]
 2023-06-26 11:55:08 +02:00
ajugo 13f0b26875
Fix uploading of old protocol tables [SCI-8736] (#5673) 2023-06-26 11:54:54 +02:00
artoscinote 8bf8b9cc72
Merge pull request #5670 from artoscinote/ma_SCI_8694 
Fix boostrap datepicker to work with new font [SCI-8694]
 2023-06-26 11:44:01 +02:00
artoscinote 9242b99c8f
Merge pull request #5669 from artoscinote/ma_SCI_8731 
CSS fixes [SCI-8731]
 2023-06-26 11:43:38 +02:00
artoscinote b6b61dfdf8
Merge pull request #5668 from artoscinote/ma_SCI_8734 
Fix repository export [SCI-8734]
 2023-06-26 11:43:14 +02:00
sboursen-scinote 49ac9a20d8 Fix folders style in table archived view [SCI-8729] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-24 13:20:46 +02:00
Martin Artnik 9ea927e5b9 Fix boostrap datepicker to work with new font [SCI-8694] 2023-06-23 15:36:14 +02:00
Martin Artnik 5e7d3f1564 CSS fixes [SCI-8731] 2023-06-23 15:01:04 +02:00
Martin Artnik 5609184c0f Fix repository export modal [SCI-8734] 2023-06-23 12:41:37 +02:00
Soufiane fdc4f4ddd7
Create an export_limit_exceeded model for repositories export [SCI-8730] (#5667) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-23 12:10:58 +02:00
Giga Chubinidze ef94a4f2bb logic refactor, url removal 2023-06-23 13:39:54 +04:00
Martin Artnik d1302d322b Fix zip export [SCI-8734] 2023-06-23 11:18:16 +02:00
artoscinote b520f8a04b
Merge pull request #5655 from aignatov-bio/ai-sci-8704-fix-avatar-popup 
Add left padding to smart annotation popup [SCI-8704]
 2023-06-23 10:51:37 +02:00
artoscinote 3ff8b44115
Merge pull request #5662 from rekonder/aj_SCI_8728 
Fix default role assigning on projects create through the dashboard [SCI-8728]
 2023-06-23 10:04:44 +02:00
artoscinote 3658a224b2
Merge pull request #5650 from okriuchykhin/ok_SCI_8718 
Limit execution time of file text extraction jobs to 5 minutes [SCI-8718]
 2023-06-23 09:55:52 +02:00
artoscinote 496fbc9eca
Merge pull request #5653 from rekonder/aj_SCI_8719 
Remove breadcrumbs project table and fix project filtering [SCI-8719]
 2023-06-23 09:54:00 +02:00
artoscinote f1876b4f59
Merge pull request #5661 from okriuchykhin/ok_SCI_8710 
Fix breadcrumbs for archived view mode [SCI-8710]
 2023-06-23 09:50:03 +02:00
Giga Chubinidze 828e566698 changed logic to accomodate templates unique design 2023-06-23 11:26:53 +04:00
Andrej 0ea3a10d26 Fix default role assigning on projects create through the dashboard [SCI-8728] 2023-06-22 16:40:50 +02:00
Oleksii Kriuchykhin e86f0e76de Fix breadcrumbs for archived view mode [SCI-8710] 2023-06-22 15:41:37 +02:00
Soufiane c71d8df470
Add support to characters in smartAnnotation [SCI-8656] (#5617) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-22 15:40:39 +02:00
Martin Artnik 9364d139e0 Make label print modal work globally [SCI-8506] 2023-06-22 14:52:47 +02:00
Soufiane b4d4043271
Prevent over submitting on new task click [SCI-8460] (#5659) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-22 14:49:53 +02:00
artoscinote c7d5bba855
Merge pull request #5657 from artoscinote/ma_SCI_8711 
Fix sticky header z-index [SCI-8711]
 2023-06-22 14:33:38 +02:00
artoscinote b78105c546
Fix column width limiting [SCI-7961] (#5656) 2023-06-22 14:33:16 +02:00
Martin Artnik 370cf4b345 Fix sticky header z-index [SCI-8711] 2023-06-22 14:06:38 +02:00
Soufiane 9c2c767f9f
Fix Drag me Canvas button [SCI-8720] (#5652) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-22 13:45:44 +02:00