scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity
13532 commits 69 branches 179 tags 165 MiB
Commit graph

13532 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Soufiane 12dd66b6a6
Fix smart annotation popover in tasks [SCI-8867] (#5805) 2023-07-18 15:59:47 +02:00
Alex Kriuchykhin 8b47982ccc
Fix fetching of WOPI discovery document [SCI-8889] (#5803) 2023-07-18 15:25:04 +02:00
artoscinote eb37a68f27
Merge pull request #5802 from sboursen-scinote/sb_SCI-8866-8867 
Fix smart annotation popover in tasks [SCI-8867]
 2023-07-18 15:01:48 +02:00
sboursen-scinote bb7eee9b64 Fix smart annotation popover in tasks [SCI-8866][SCI-8867] 2023-07-18 14:55:19 +02:00
aignatov-bio bab8e2c330
Merge pull request #5796 from aignatov-bio/ai-sci-8883-fix-snapshot-table-render 
Fix snapshot table render [SCI-8883]
 2023-07-18 14:16:13 +02:00
wandji 59077e5ab6
Fix css issues for reports wizard steps [SCI-8786] (#5724) 
* Fix css issues got reports wizard steps [SCI-8786]

* Fix linter errors [SCI-8786]

* Improve caret alignment for report wizard [SCI-8786]
 2023-07-18 13:39:20 +02:00
wandji aafeb456fa
Fix CSS issues in experiments tasks page and modal [SCI-8766] (#5738) 
* Fix CSS issues in experiments tasks page and modal [SCI-8766]

* Fix linter errors [SCI-8766]

* Increase spacing for icons in ask display modal and remove html.erb extention from render partial

* Optimize changes [SCI-8766]
 2023-07-18 13:38:50 +02:00
wandji 7dcc774414
Refactor html partial rendering in json responses [SCI-8811] (#5763) 
* Remove redundant use of respond_to in controlller actions with just one responder format [SCI-8811]

* Remove redundant begin block and replace 303 status code with :see_other [SCI-8811]
 2023-07-18 13:36:41 +02:00
artoscinote 9a488f9440
Merge pull request #5761 from G-Chubinidze/gc_SCI_8824 
Fixed default avatar on activity page [SCI-8824]
 2023-07-18 13:00:09 +02:00
Giga Chubinidze 3cf1c5365f conflict fix 2023-07-18 14:18:41 +04:00
Anton f710691709 Fix snapshot table render [SCI-8883] 2023-07-18 11:43:55 +02:00
artoscinote ad4724ba04
Add salt to token JWT token payload [SCI-8854] (#5791) 2023-07-18 09:22:39 +02:00
artoscinote 5a65b94ce3
Merge pull request #5714 from wandji20/wb-SCI-8744 
Set blank default date for added_on repository filters [SCI-8744]
 2023-07-18 08:41:14 +02:00
artoscinote e79c73f8c4
Merge pull request #5777 from wandji20/wb-SCI-8851 
Fix issue archiving task result tables and when downloading archived result table
 2023-07-18 08:18:11 +02:00
artoscinote a1128d2c66
Merge pull request #5779 from G-Chubinidze/gc_SCI_8791 
CSS: Inventories filter input width [SCI-8791]
 2023-07-18 08:16:52 +02:00
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
artoscinote 3e5de32105
Merge pull request #5793 from G-Chubinidze/gc_SCI_8663 
Clunky parts: button initialization when P/E/T view is changed [SCI-8663]
 2023-07-18 08:14:58 +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
Soufiane 4808f6438c
Fix CSP script-src [SCI-8634] (#5781) 2023-07-17 11:26:41 +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
Soufiane 18f383c543
Update CSP script-src-elem [SCI-8634] (#5775) 2023-07-14 15:38:00 +02:00
Soufiane 51a19a559b
Define allowed scripts src-elem for CSP [SCI-8634] (#5771) 2023-07-14 14:25:24 +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
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
aignatov-bio 6d00f22657
Merge pull request #5765 from aignatov-bio/ai-sci-8789-fix-canvas-css 
Fix canvas styling [SCI-8789]
 2023-07-13 15:09:44 +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