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

3566 commits

Author SHA1 Message Date
aignatov-bio 6ac5ad3d71
Merge pull request #7426 from wandji20/wb-SCI-10475 
Add asset results to global search page [SCI-10475]
 2024-04-04 13:59:24 +02:00
wandji20 d76fbf1eba Add report results to global search page [SCI-10479] 2024-04-04 10:54:16 +01:00
wandji20 6483780d33 Add asset results to global search page [SCI-10475] 2024-04-04 10:51:01 +01:00
Anton c6f5997fda Add filter component to quick search [SCI-10305] 2024-04-04 11:49:20 +02:00
Andrej ae5cebe7d7 Implement quick search backend [SCI-10246] 2024-04-04 11:24:17 +02:00
aignatov-bio 6c5efb604f
Merge pull request #7416 from sboursen-scinote/sb_SCI-10476 
Implement global search results component for inventory items [SCI-10476]
 2024-04-04 09:56:13 +02:00
Anton ba5eca7d8e Merge branch 'features/global-search' of github.com:scinote-eln/scinote-web into features/global-search 2024-04-03 14:47:59 +02:00
Anton f6aae51f83 Merge branch 'develop' into features/global-search 2024-04-03 14:47:28 +02:00
Andrej 6e95ba13f9 Merge branch 'develop' into features/sso-improvements 2024-04-03 13:32:15 +02:00
sboursen-scinote b54c4f725b Fix hound [SCI-10476] 2024-04-03 01:23:37 +02:00
sboursen-scinote 31994b643a Fix hound [SCI-10478] 2024-04-03 01:08:53 +02:00
sboursen-scinote da19a79851 Implement global search results component for Label templates [SCI-10478] 2024-04-03 01:04:43 +02:00
sboursen-scinote 84dd5eaa70 Implement global search results component for inventory items [SCI-10476] 2024-04-03 00:55:09 +02:00
Andrej d4f33ff33d Fix activity generation at project visibility change [SCI-10569] 2024-04-02 16:29:04 +02:00
wandji20 06ef479a1e Add archived tag to protocol liked tasks modal items [SCI-10560] 2024-04-01 22:04:02 +01:00
wandji20 230f180f18 Add experiment group to global search page [SCI-10471] 2024-03-29 08:34:13 +01:00
wandji20 d6a98b76fd Rebase work [SCI-10470] 2024-03-27 16:11:06 +01:00
wandji20 1f7566ae73 Add project folders group to global search page [SCI-10470] 2024-03-27 16:03:56 +01:00
sboursen-scinote 9c6dac339e Implement global search results component for Protocol templates [SCI-10477] 2024-03-27 10:37:36 +01:00
Andrej ac9c16d459 Merge branch 'develop' into features/sso-improvements 2024-03-26 10:36:04 +01:00
aignatov-bio 539f58441a
Merge pull request #7359 from wandji20/wb-SCI-10367 
Fix task assigned users search query and CSS [SCI-10367]
 2024-03-26 09:15:31 +01:00
wandji20 09f4ad7a3d Fix task assgned users search query and CSS [SCI-10367] 2024-03-25 12:01:48 +01:00
Anton 478da52272 Add projects search results component [SCI-10469] 2024-03-22 16:37:59 +01:00
wandji20 8b0a2d51b5 Fix issue loading navigator [SCI-10513] 2024-03-22 12:37:00 +01:00
Anton fe1aee4f23 Add general layout for global search [SCI-10468] 2024-03-21 15:56:35 +01:00
Anton 63c0c554e6 Merge branch 'develop' into features/global-search 2024-03-21 14:24:37 +01:00
aignatov-bio 90405e0205
Merge branch 'develop' into ai-sci-10488-fix-assigned-user-for-task 2024-03-20 16:43:00 +01:00
Anton 93b75403df Fix designated users on task and new task modal [SCI-10488] 2024-03-20 15:59:38 +01:00
sboursen-scinote 9dca8e7c4b Fix folder visibility in navigator [SCI-10482] 2024-03-20 15:44:13 +01:00
Andrej c75dd047bc Fix loading of projects table navigator [SCI-10450] 2024-03-19 09:43:44 +01:00
wandji20 a896d95664 Revert task status changes [SCI-10198] 2024-03-18 18:17:12 +01:00
ajugo 0419609a1a
Add permission check for experiment and task list [SCI-10450] (#7296) 2024-03-18 10:52:37 +01:00
wandji 6313dd0ba0
Revert "Call task checkStateState after status update [SCI-10198] (#7272)" 
This reverts commit 8165f46f3f.
 2024-03-18 10:17:16 +01:00
ajugo fd5ed15003
Fix change of sharing repository settings [SCI-10428] (#7294) 2024-03-18 09:37:36 +01:00
ajugo 521d500b8d
Merge pull request #7303 from sboursen-scinote/sb_SCI-10331-fix 
Various issues with Reports [SCI-10331]
 2024-03-18 09:24:57 +01:00
ajugo 8a9c4e6cb9
Merge pull request #7292 from wandji20/wb-SCI-10419 
Add support for filtering projects in experiment controller clone and move actions SCI-[10419]
 2024-03-18 09:01:22 +01:00
sboursen-scinote ea5016f5bb Fix save to invetory modal [SCI-10331] 2024-03-17 11:19:05 +01:00
wandji20 5b5f593537 Add support for filtering projects in experiment controller clone and move actions SCI-[10419] 2024-03-16 16:53:00 +01:00
wandji20 e58b616a7b Fix issue loading experiment assigned users [SCI-10455] 2024-03-16 06:08:19 +01:00
wandji 6b0be64952
Add user preferences link in notification settings flyout [SCI-10438] (#7280) 2024-03-14 13:27:27 +01:00
Soufiane ce5c02d590
Fix user roles for protocol access modal [SCI-10388] (#7275) 2024-03-14 13:17:07 +01:00
wandji 8165f46f3f
Call task checkStateState after status update [SCI-10198] (#7272) 2024-03-14 13:15:32 +01:00
Martin Artnik be4f27750c Merge branch 'release/1.30.0' into develop 2024-03-13 15:26:35 +01:00
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 fa25716e24 Fix ambiguous column references in results controller [SCI-10433] 2024-03-12 17:21:10 +01:00
ajugo 166a9592f5
Fix designated users flyout filtering [SCI-10415] (#7252) 2024-03-12 14:16:45 +01:00
wandji 9e39181242
Update protocols linked task modal to match figma design [SCI-10392] (#7243) 2024-03-12 14:13:13 +01:00
Soufiane 9dcd831704
Fix various issues with Reports [SCI-10331] (#7219) 2024-03-12 13:57:55 +01:00
Alex Kriuchykhin 8f09c9bc26
Fix unsafe user handling in the Linkedin sign-up flow [SCI-10421] (#7259) 2024-03-12 13:02:44 +01:00
Alex Kriuchykhin e835925ab9
Improve sign in handling in OmniAuth controller [SCI-10421] (#7247) 2024-03-12 09:43:53 +01:00
Giga Chubinidze ac47dcf0a5 Inventory duplicating removes old inventory stock units [SCI-10251] 2024-03-08 18:33:13 +04:00
Oleksii Kriuchykhin d004b1e7a0 Merge branch 'features/bugfixes' into develop 2024-03-08 11:21:26 +01:00
ajugo bd920611e9
Fix read project users permission [SCI-10355] (#7224) 2024-03-07 13:32:20 +01: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
Alex Kriuchykhin c1263eb06f
Fix ordering by ID in protocols and tasks tables, remove obsolete protocols datatable [SCI-10387] (#7209) 2024-03-06 16:04:41 +01:00
ajugo 654b107965
Fix ordering on share repository modal [SCI-4716] (#7207) 2024-03-06 13:58:31 +01:00
aignatov-bio d807b56b28
Merge pull request #7167 from aignatov-bio/ai-sci-10301-add-pagination-to-linked-tasks-modal 
Add pagination to linked task modal [SCI-10301]
 2024-03-01 17:29:42 +01:00
Anton 6b27779746 Add pagination to linked task modal [SCI-10301] 2024-03-01 17:28:42 +01:00
aignatov-bio 1abd370d3e
Merge pull request #7158 from wandji20/wb-SCI-10292 
Fix issue moving experiments [SCI-10292]
 2024-02-29 13:29:33 +01:00
wandji20 b59392b932 Fix issue moving experiments [SCI-10292] 2024-02-28 13:58:09 +01:00
Giga Chubinidze cfa859b7c7 Inventory duplicating and stock column issues [SCI-10251] 2024-02-28 16:42:11 +04:00
Anton 0d7f3993f6 Fix versions modal [SCI-10296] 2024-02-28 12:42:31 +01:00
Anton 5902161cb9 Replace old access modal [SCI-10267] 2024-02-26 15:22:09 +01:00
Anton d72e63a0f2 Merge branch 'develop' into features/inventory-import-improvements 2024-02-26 10:46:49 +01:00
Anton 57c5140267 Add quick filter flyout [SCI-10248] 2024-02-23 14:16:03 +01:00
Anton 41e92dd1e2 Fix multiple resize [SCI-10245] 2024-02-21 19:44:22 +01:00
wandji20 8221466666 Replace task flow buttons partial after successful change of task status [SCI-10198] 2024-02-21 15:25:04 +01:00
Anton ed0db94089 Merge branch 'develop' into features/new-datatable 2024-02-21 12:51:17 +01:00
Anton fdee40ba97 Fix protocol access template [SCI-10242] 2024-02-21 12:33:30 +01:00
Martin Artnik f8aae8aca6 Merge branch 'develop' into features/inventory-import-improvements 2024-02-20 15:18:07 +01:00
Martin Artnik fc441bbfaa Fixed typos in clone experiment action [SCI-10232] 2024-02-19 10:46:47 +01:00
Anton 54428ff4f1 Fix routes for experiments my modules [SCI-10207] 2024-02-16 13:15:47 +01:00
Martin Artnik 7ac00c5007 Fix making backup copy of conflicting files [SCI-10228] 2024-02-16 13:06:17 +01:00
Ivan Kljun aae8d4d227 Remove team arg from post_process_file [SCI-10103] 2024-02-16 10:39:19 +01:00
Ivan Kljun c8b910ebc4 Merge remote-tracking branch 'upstream/develop' into SCI-10103-ik2 2024-02-16 10:06:27 +01:00
Ivan Kljun c043a9375a Fix asset sync update to account for WOPI and post process [SCI-10103] 2024-02-16 09:53:26 +01:00
Oleksii Kriuchykhin 66f5df87e9 Merge branch 'develop' into features/sso-improvements 2024-02-16 09:46:20 +01:00
Ivan Kljun e35878a9b8 Fix saving last_modified_by for WOPI audit trails [SCI-10033] 2024-02-15 14:14:38 +01:00
ajugo 7fe6aae843
Fix consumption check for full view repository [SCI-10184] (#7082) 2024-02-13 15:05:34 +01:00
Martin Artnik baa2201622
Merge pull request #7070 from ivanscinote/SCI-10122-ik 
Add polling for asset changes for SciNote Edit [SCI-10122]
 2024-02-12 14:15:48 +01:00
Ivan Kljun 5276faa74b Fix applying last_modified_by at asset update [SCI-10033] 2024-02-07 15:31:13 +01:00
Ivan Kljun aec115f669 Add polling for asset changes for SciNote Edit [SCI-10122] 2024-02-07 11:26:40 +01:00
Alex Kriuchykhin 8fa1c21e73
Fix snapshoting for LinkedRepository caused by external_id uniqueness constraint [SCI-9817] (#7066) 2024-02-06 14:23:01 +01:00
Gregor Lasnibat e8c74a057e (fix) Missing page data at opening result page from link [SCI-9462] 2024-02-06 12:59:37 +01:00
Alex Kriuchykhin 342e9dbb19
Switch to asset text extraction with ActiveStorage analyzer [SCI-9954] (#6956) 2024-02-05 16:24:06 +01:00
Martin Artnik 3a700bae13 Add create activity in case of asset sync file conflict [SCI-10021] 2024-02-05 13:12:21 +01:00
ajugo 71be4db51b
Fix sorting of teams on shared inventory modal window and sorting on task assigning modal [SCI-4716] (#7051) 2024-02-05 10:27:01 +01:00
ajugo 6184d0caa8
Add obsolete tag for not used activites [SCI-10121] (#7050) 2024-02-05 10:25:20 +01:00
Soufiane e85f48d51f
Delay marking Docx report as ready till after preview is created [SCI-10037] (#7025) 2024-02-05 10:18:23 +01:00
Oleksii Kriuchykhin e724b15499 Merge branch 'develop' into features/sso-improvements 2024-02-01 15:38:07 +01:00
Ivan Kljun e4e3a61c5a Merge remote-tracking branch 'upstream/features/new-datatable' into SCI-9983-ik 2024-02-01 11:00:31 +01:00
Martin Artnik baa5a57822
Merge pull request #7002 from ivanscinote/SCI-10033-ik 
Update last_modified_by for assets on edit [SCI-10033]
 2024-02-01 10:19:08 +01:00
Martin Artnik 73541e8c42 Fix experiment bulk move permission checks, specs [SCI-9840] 2024-01-31 13:52:56 +01:00
Anton 72b40a63a0 Merge branch 'develop' into features/new-datatable 2024-01-30 12:02:04 +01:00
Anton fad8b53222 Update task table designated users [SCI-10092] 2024-01-25 15:56:48 +01:00
Oleksii Kriuchykhin 384afbcc4b Merge branch 'features/asset-sync' into develop 2024-01-25 11:32:26 +01:00
Ivan Kljun 24faeae5de Update last_modified_by for assets on edit [SCI-10033] 2024-01-24 15:18:34 +01:00
Ivan Kljun 718f5fbfad Add error messages to AssetSyncController [SCI-10020] 2024-01-24 11:02:37 +01:00
ajugo fc99c0ef5b
Fix reordering of the result elements [SCI-10079] (#6998) 2024-01-24 10:07:59 +01:00