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

15632 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Artnik 560ff947e5
Merge pull request #7266 from artoscinote/ma_SCI_10433 
Fix ambiguous column references in results controller [SCI-10433]
 2024-03-13 10:55:49 +01:00
Martin Artnik d654f1dd6e
Merge pull request #7267 from artoscinote/ma_SCI_10422 
Force input locale [SCI-10422]
 2024-03-12 17:41:29 +01:00
Martin Artnik ae51a04c90 Force input locale [SCI-10422] 2024-03-12 17:38:36 +01:00
Martin Artnik fa25716e24 Fix ambiguous column references in results controller [SCI-10433] 2024-03-12 17:21:10 +01:00
Martin Artnik 8a0e5802ac
Merge pull request #7261 from artoscinote/ma_SCI_10422 
Clean up stock management modal [SCI-10422]
 2024-03-12 15:13:21 +01:00
Martin Artnik 763c741662 Clean up stock management modal [SCI-10422] 2024-03-12 13:24:55 +01:00
Martin Artnik 1209bb8615
Merge pull request #7197 from G-Chubinidze/gc_SCI_10237 
HTML report from exported project security issue [SCI-10237]
 2024-03-12 11:01:22 +01:00
ajugo e7bd0d5764
Merge pull request #7242 from G-Chubinidze/gc_SCI_10251_v2 
Inventory duplicating removes old inventory stock units [SCI-10251]
 2024-03-08 16:27:32 +01:00
Giga Chubinidze ac47dcf0a5 Inventory duplicating removes old inventory stock units [SCI-10251] 2024-03-08 18:33:13 +04:00
ajugo 8407361083
Merge pull request #7215 from G-Chubinidze/gc_SCI_10239 
For item relationship missing archived tag for inventory [SCI-10239]
 2024-03-07 08:50:06 +01:00
Giga Chubinidze afe573a044 For item relationship missing archived tag for inventory [SCI-10239] 2024-03-07 04:25:03 +04:00
Giga Chubinidze 48b4dbe1fe HTML report from exported project security issue [SCI-10237] 2024-03-04 23:09:38 +04:00
ajugo 21b41326d6
Merge pull request #7171 from lasniscinote/gl_SCI_10334 
(fix) CAPA - Tasks order in the reports widget is random [SCI-10334]
 2024-03-04 10:40:12 +01:00
Martin Artnik 8dbdb8e462
Merge pull request #7180 from lasniscinote/gl_SCI_10278 
(fix) Scinote is freezed at selecting time column in inventory filter [SCI-10278]
 2024-03-01 14:32:42 +01:00
Gregor Lasnibat 3871e4e1a4 (fix) Scinote is freezed at selecting time column in inventory filter [SCI-10278] 2024-03-01 11:55:36 +01:00
Gregor Lasnibat d082e14689 (fix) CAPA - Tasks order in the reports widget is random [SCI-10334] 2024-02-29 15:03:28 +01:00
Martin Artnik ca26f60f7a
Merge pull request #7159 from G-Chubinidze/gc_SCI_10251 
Inventory duplicating and stock column issues [SCI-10251]
 2024-02-28 15:15:18 +01:00
Giga Chubinidze cfa859b7c7 Inventory duplicating and stock column issues [SCI-10251] 2024-02-28 16:42:11 +04:00
Martin Artnik 02e8fc4e45
Merge pull request #7143 from G-Chubinidze/gc_SCI_10254 
Loading file to results - wrong file and preview [SCI-10254]
 2024-02-27 11:41:44 +01:00
Martin Artnik 1615c7f10a
Merge pull request #7134 from G-Chubinidze/gc_SCI_10238 
Checklist/table/RTF titles are in one line [SCI-10238]
 2024-02-27 10:02:42 +01:00
Giga Chubinidze ca831cb103 Loading file to results - wrong file and preview [SCI-10254] 2024-02-27 12:48:34 +04:00
Giga Chubinidze 6aa3532472 Checklist/table/RTF titles are in one line [SCI-10238] 2024-02-23 14:10:48 +04:00
ajugo 45353987ad
Merge pull request #7112 from rekonder/aj_SCI_10171 
Improve query for assigned task counter on protocol template [SCI-10171]
 2024-02-21 15:18:12 +01:00
Andrej 17b1c87c1b Improve query for assigned task counter on protocol template [SCI-10171] 2024-02-20 10:46:49 +01:00
ajugo 3affe924ae
Merge pull request #7108 from rekonder/aj_SCI_10193 
Fix assigned repository export in project export [SCI-10193]
 2024-02-20 09:54:11 +01:00
Andrej 22908fe139 Fix assigned repository export in project export [SCI-10193] 2024-02-19 18:08:12 +01:00
wandji 2798005eb6
Only call inventory table restoreColumnSize in save state callbback on initial load [SCI-10195] (#7100) 2024-02-16 10:22:24 +01:00
Gregor Lasnibat 34777d766d
Merge pull request #7091 from lasniscinote/gl_SCI_10086 
(fix) Non decimal number in inventory table has commas [gl-SCI-10086]
 2024-02-15 12:56:39 +01:00
Soufiane 5634877e95
Fix Axios get request syntax [SCI-10075] (#7088) 2024-02-15 12:55:40 +01:00
Gregor Lasnibat 71bbe02eba (fix) Non decimal number in inventory table has commas [gl_SCI_10086] 2024-02-15 12:50:31 +01:00
ajugo ab061ee0f8
Improve loading speed of protocol template [SCI-10171] (#7086) 2024-02-14 09:39:22 +01:00
Oleksii Kriuchykhin 7430a28787 Merge branch 'develop' 2024-01-24 13:00:50 +01:00
Oleksii Kriuchykhin 4a13476b90 Bump version to 1.30.0 2024-01-24 12:59:54 +01:00
ajugo fc99c0ef5b
Fix reordering of the result elements [SCI-10079] (#6998) 2024-01-24 10:07:59 +01:00
Alex Kriuchykhin f9a1b952b6
Split inventory item relationships API V2 endpoint into separate endpoints for parents and children [SCI-10078] (#6996) 2024-01-24 10:04:38 +01:00
Gregor Lasnibat 73beb3abf5
Merge pull request #6992 from lasniscinote/gl_SCI_10074 
(fix) Content disappears until page refresh when moving it between results [SCI-10074]
 2024-01-23 14:58:21 +01:00
Gregor Lasnibat e46cfdc0d4 (fix) Content disappears until page refresh when moving it between results [SCI-10074] 2024-01-23 14:10:08 +01:00
ajugo 8eeaf1015e
Merge pull request #6990 from rekonder/aj_SCI_10072 
Fix archive label for assigned items on repository cards  [SCI-10072]
 2024-01-23 13:19:36 +01:00
Andrej c90c29332f Fix archive label for assigned items on repository cards [SCI-10072] 2024-01-23 11:38:59 +01:00
Oleksii Kriuchykhin d71061a75d Merge branch 'release/1.28.0' into develop 2024-01-23 11:17:14 +01:00
Alex Kriuchykhin bbe01f9d38
Fix inclusion of TinyMCE images in project exports [SCI-10051] (#6988) 2024-01-23 10:16:25 +01:00
ajugo 32b721e07d
Remove Assigned section from item card for snapshot [SCI-10066] (#6986) 2024-01-23 09:27:00 +01:00
Gregor Lasnibat 85cd24fa81
(fix) Assign from task page is closed at opening item card [SCI-10063] (#6985) 2024-01-23 09:26:30 +01:00
ajugo 53253b462e
Fix loading project activites [SCI-10034] (#6977) 2024-01-22 15:32:30 +01:00
Martin Artnik a90bf802e0
Merge pull request #6983 from lasniscinote/gl_SCI_10061 
(fix) Well plate 12 option and 24 translation missing [SCI_10061_v2]
 2024-01-22 11:13:14 +01:00
Gregor Lasnibat fc606a7dd4 (fix) Well plate 12 option and 24 translation missing [SCI_10061] 2024-01-22 11:01:31 +01:00
Soufiane 313782d3d4
Implement API V2 tests for item relationships [SCI-10038] (#6972) 2024-01-22 10:50:23 +01:00
wandji 482472fb21
Fix missing unlink icon for child item relationship [SCI-10062] (#6982) 2024-01-22 10:49:07 +01:00
Soufiane e70889c001
Unlink items to other shared repositories on unsharing [SCI-10055] (#6981) 
- Team A has Repository A with Item A
 - Team B
 - Team C has Repository C with Item C

1) Share Repository A and Repository C to Team B

2) Link Item A to Item C in Team B

3) Unshare Repository A from Team B

Item A is unlinked to Item C
 2024-01-22 10:45:23 +01:00
Martin Artnik 62f040d475
Merge pull request #6978 from lasniscinote/gl_SCI_10061 
(fix) Well plate 12 option and 24 translation missing [SCI-10061]
 2024-01-19 15:28:43 +01:00