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

9174 commits

Author SHA1 Message Date
aignatov-bio 1feaa5fb71
Merge pull request #4777 from aignatov-bio/ai-sci-7699-experiment-table-css-fixes 
Fix small css issues [SCI-7699][SCI-7694][SCI-7678]
 2023-01-10 10:39:22 +01:00
Alex Kriuchykhin 6c313f86ac
Merge pull request #4680 from okriuchykhin/ok_SCI_7455 
Add API endpoint for retrieving a list of users [SCI-7455]
 2023-01-10 10:21:23 +01:00
ajugo 9f6887ddcc
Fix step element reordering at importing protocol [SCI-7529] (#4677) 2023-01-09 16:08:27 +01:00
Martin Artnik da5324d2a1 Fix task access modal for archived experiments [SCI-7683] 2023-01-09 16:04:57 +01:00
Martin Artnik d4326c08db Add duplicating tooltips [SCI-7382] 2023-01-09 12:40:00 +01:00
Anton 85eaf7c246 Fix small css issues [SCI-7699][SCI-7694][SCI-7678] 2023-01-09 12:33:59 +01:00
Martin Artnik 2edbd2fb74 Fix display of archived tasks [SCI-7653] 2023-01-09 11:40:45 +01:00
ajugo 83ba9d40dc
Refresh canvas navigator after moved tasks [SCI-7661] (#4774) 2023-01-09 09:53:03 +01:00
ajugo 92e044dfd3
Fix locked task duplication [SCI-7682] (#4773) 2023-01-09 09:52:34 +01:00
aignatov-bio feb596179f
Merge pull request #4772 from aignatov-bio/ai-sci-7691-fix-new-task-modal-styling 
Experiment table - fix new task modal CSS [SCI-7691]
 2023-01-06 20:28:24 +01:00
Oleksii Kriuchykhin b29aeab67a Add API endpoint for retrieving a list of users [SCI-7455] 2023-01-06 16:33:00 +01:00
aignatov-bio 329ac41bb7
Merge pull request #4770 from aignatov-bio/ai-sci-7689-fix-canvas-page-responsivness 
Fix canvas page responsiveness [SCI-7689]
 2023-01-06 13:10:52 +01:00
aignatov-bio 29c13d8578
Merge pull request #4769 from aignatov-bio/ai-sci-7695-fix-comments-view-mode-experiment-table 
Experiment table - fix comments view mode [SCI-7695]
 2023-01-06 13:10:42 +01:00
aignatov-bio 3282c1104b
Merge pull request #4768 from aignatov-bio/ai-sci-7692-assigned-users-icons-not-alligned 
Fix assigned users icons alignment [SCI-7692]
 2023-01-06 13:10:32 +01:00
aignatov-bio 46dfe2aa37
Merge pull request #4767 from aignatov-bio/ai-sci-7693-fix-view-mode-for-experiment-table-assigned-users 
Experiment table - fix view mode for assigned users [SCI-7693]
 2023-01-06 13:10:23 +01:00
Anton 7a7d2c0e1b Experiment table - fix new task modal CSS [SCI-7691] 2023-01-06 13:04:29 +01:00
Anton 3aa71fe85e Fix canvas page responsivness [SCI-7689] 2023-01-06 12:08:35 +01:00
Anton c513e6bca7 Experiment table - fix comments view mode [SCI-7695] 2023-01-06 12:02:35 +01:00
Anton 7aad22b138 Fix assigned users icons allignment [SCI-7692] 2023-01-06 11:51:32 +01:00
Anton 802e0e602b Experiment table - fix view moda for assigned users [SCI-7693] 2023-01-06 11:44:48 +01:00
aignatov-bio fe58a7a206
Merge pull request #4766 from aignatov-bio/ai-sci-7699-fix-z-index-for-experiment-table-header 
Fix zIndex for experiment table header [SCI-7699]
 2023-01-06 11:25:10 +01:00
aignatov-bio fbc1247e5b
Merge pull request #4765 from aignatov-bio/ai-sci-7700-fix-canvas-navigator-on-task-duplication 
Refresh experiment workflow image on task duplication [SCI-7700]
 2023-01-06 11:24:59 +01:00
aignatov-bio 0e1bf8368a
Merge pull request #4764 from aignatov-bio/ai-sci-7694-fix-new-task-canvas-position 
Fix new task canvas position [SCI-7694]
 2023-01-06 11:24:49 +01:00
aignatov-bio ac3434101b
Merge pull request #4763 from aignatov-bio/ai-sci-7690-fix-task-id-in-experiment-table 
Fix task id in experiment table [SCI-7690]
 2023-01-06 11:24:40 +01:00
aignatov-bio 7e08c62ce9
Merge pull request #4762 from aignatov-bio/ai-sci-7678-experiment-table-small-css-fixes 
Experiment table small css fixes [SCI-7678]
 2023-01-06 11:24:30 +01:00
Anton 0dd7702786 Fix zIndex for experiment table header [SCI-7699] 2023-01-06 11:18:44 +01:00
Anton 46acb5ff3c Refresh experiment workflow image on task duplication [SCI-7700] 2023-01-06 11:11:39 +01:00
Anton a8f6076b73 Fix new task canvas position [SCI-7694] 2023-01-06 11:02:56 +01:00
Anton a98aad56db Fix task id in experiment table [SCI-7690] 2023-01-06 10:58:41 +01:00
Anton f73d2496b8 Experiment table small css fixes [SCI-7678] 2023-01-06 10:54:38 +01:00
artoscinote 9914f19634
Merge pull request #4760 from G-Chubinidze/gc_SCI_7651 
Missing experiment table empty state, fix breadcrumbs [SCI-7651]
 2023-01-06 10:51:34 +01:00
Giga Chubinidze 79c7e6f0a2 Missing experiment table empty state, fix breadcrumbs [SCI-7651] 2023-01-06 11:40:41 +04:00
aignatov-bio 478269d579
Merge pull request #4759 from aignatov-bio/ai-sci-7680-fix-zoom-option-button-icon-color 
Fix color of zoom option button [SCI-7680]
 2023-01-05 17:27:36 +01:00
aignatov-bio d995019efa
Merge pull request #4758 from aignatov-bio/ai-sci-7687-fix-columns-during-sorting 
Fix placeholder columns during sorting [SCI-7687]
 2023-01-05 17:27:26 +01:00
aignatov-bio d0fd4e1cbf
Merge pull request #4757 from aignatov-bio/ai-sci-7681-microinteractions-edit-experiment-name-field 
Add microinteractions to edit experiment name field [SCI-7681]
 2023-01-05 17:27:15 +01:00
aignatov-bio 78299b64f4
Merge pull request #4756 from aignatov-bio/ai-sci-7646-fix-archived-tasks-logn-experiment-name 
Fix long experiment name on archived tasks card view [SCI-7646]
 2023-01-05 17:27:03 +01:00
Anton 79209054c4 Fix color of zoom option button [SCI-7680] 2023-01-05 13:29:13 +01:00
Anton 00d8e2dd63 Fix placeholder columns during sorting [SCI-7687] 2023-01-05 13:10:51 +01:00
Anton 637a53cbc6 Add microinteractions to edit experiment name field [SCI-7681] 2023-01-05 12:43:19 +01:00
ajugo f8d2edc2c8
Fix Manage access in the experiment table view [SCI-7648] (#4752) 2023-01-05 12:00:33 +01:00
ajugo 32e9329bcc
Fix user assign modal in experiment archived table view [SCI-7654] (#4742) 2023-01-05 12:00:12 +01:00
Anton ca30c6a094 Fix long experiment name on archived tasks card view [SCI-7646] 2023-01-05 11:54:38 +01:00
ajugo 194c519a9b
Fix experiment table due date initialization [SCI-7649] (#4730) 
* Fix experiment table due date initialization [SCI-7649]

* Fix due date overflow [SCI-7649]
 2023-01-05 11:14:34 +01:00
artoscinote 36af73eb7c
Merge pull request #4749 from artoscinote/ma_SCI_7653 
Fix display of tasks table in archived experiments [SCI-7653]
 2023-01-04 13:14:22 +01:00
artoscinote 710a97a50e
Merge pull request #4751 from artoscinote/ma_SCI_7596 
Don't touch result when comment is created [SCI-7596]
 2023-01-04 13:14:07 +01:00
Martin Artnik 7460cc5b82 Don't touch result when comment is created [SCI-7596] 2023-01-04 12:55:32 +01:00
Martin Artnik 15543d5222 Do not touch protocol if step or checklist is checked [SCI-7584] 2023-01-04 12:33:11 +01:00
Martin Artnik d466db1658 Fix display of tasks table in archived experiments [SCI-7653] 2023-01-04 11:56:25 +01:00
aignatov-bio eaa7928617
Merge branch 'develop' into ai-sci-7167-update-repository-project-logic 2023-01-04 10:08:38 +01:00
aignatov-bio fa881253b6
Merge pull request #4672 from aignatov-bio/ai-sci-7531-fix-cross-team-redirections 
Add missed notifications to steps and fix notification for protocol repository [SCI-7531]
 2023-01-04 10:07:36 +01:00
aignatov-bio 9522deef52
Merge pull request #4664 from aignatov-bio/ai-sci-7394-update-protocol-io-import-screen 
CSS update for protocol import screen [SCI-7394]
 2023-01-04 10:07:19 +01:00
aignatov-bio 6af72a28ee
Merge pull request #4715 from aignatov-bio/ai-sci-7559-add-step-text-notification 
Add new step text notification [SCI-7559]
 2023-01-04 10:06:57 +01:00
ajugo 4f55b4a749
Fix advanced filters on PET tables [SCI-7650] (#4747) 2023-01-04 09:59:05 +01:00
Alex Kriuchykhin 53a2ea6df7
Merge pull request #4649 from okriuchykhin/ok_SCI_7505 
Improve activity records creation in controllers [SCI-7505]
 2023-01-03 15:16:00 +01:00
ajugo ae55935002
Add missing microinteractions on step editing [SCI-7575] (#4711) 2023-01-03 12:25:22 +01:00
ajugo 6844144503
Fix experiment table sidebar navigation [SCI-7652] (#4741) 2023-01-03 12:24:56 +01:00
aignatov-bio b43813366e
Merge pull request #4738 from aignatov-bio/ai-sci-7645-update-tags-selector-new-task 
Update tags selection [SCI-7645]
 2023-01-03 11:59:27 +01:00
aignatov-bio 1a161c55f4
Merge pull request #4740 from aignatov-bio/ai-sci-7646-fix-experiment-table-title-width 
Fix experiment table title width [SCI-7646]
 2023-01-03 11:59:16 +01:00
Martin Artnik 1b4c209180 Fix syntax error [SCI-7368] 2022-12-23 15:03:02 +01:00
Anton 30606428e9 Fix experiment table title width [SCI-7646] 2022-12-23 10:35:17 +01:00
Anton 031ba603fc Update tags selection [SCI-7645] 2022-12-22 17:39:51 +01:00
aignatov-bio ea661f3c19
Merge branch 'develop' into features/new_experiment_views 2022-12-22 13:33:25 +01:00
ajugo 2920dca900
Clear row selection after experiment table reload [SCI-7647] (#4731) 2022-12-22 13:30:27 +01:00
ajugo b549938f13
Fix print modal css [SCI-7437] (#4648) 2022-12-22 11:09:20 +01:00
aignatov-bio 5528686d7b
Merge pull request #4661 from aignatov-bio/ai-sci-7424-update-cheklist-table-name-copy 
Add suffix for checklist and table duplication [SCI-7424]
 2022-12-22 09:58:12 +01:00
aignatov-bio e3036d923b
Merge pull request #4686 from G-Chubinidze/gc_SCI_7496 
The View flyout in the Archived tasks view [SCI-7496]
 2022-12-20 15:19:58 +01:00
artoscinote 41e629d96c
Merge pull request #4728 from artoscinote/ma_SCI_7641 
Fix duplicate entries for recent work [SCI-7641]
 2022-12-20 15:12:58 +01:00
Martin Artnik 45aad7f429 Fix duplicate entries for recent work [SCI-7641] 2022-12-20 14:32:22 +01:00
Alex Kriuchykhin 5aaeee4b16
Merge pull request #4727 from okriuchykhin/ok_SCI_7422_v2 
Fix viewer permissions for inventories [SCI-7422]
 2022-12-20 13:43:36 +01:00
Oleksii Kriuchykhin 72f1cf2704 Fix viewer permissions for inventories [SCI-7422] 2022-12-20 13:26:38 +01:00
Anton 250a4b4602 CSS fixes for project/experiments cards [SCI-7628] 2022-12-20 12:51:44 +01:00
G-Chubinidze f463664885
Merge pull request #4724 from G-Chubinidze/gc_SCI_7449 
FE | BE Add new task modal field for Tags [SCI-7449]
 2022-12-20 15:50:15 +04:00
Giga Chubinidze 377872dda3 hound code cleanup 2022-12-20 10:37:40 +04:00
Giga Chubinidze 1a84c60c74 FE | BE Add new task modal field for Tags [SCI-7449] 2022-12-19 14:55:38 +04:00
Anton 2fd2d7300e Revert modified date on experiment card 2022-12-19 11:32:32 +01:00
Alex Kriuchykhin f44cb2a1bb
Merge pull request #4716 from okriuchykhin/ok_SCI_7577_v2 
Improve handling of unaccessible inventories in snapshot versions sidebar [SCI-7422]
 2022-12-19 10:33:52 +01:00
ajugo 41892e35c6
Fix docx report generator for links in activity [SCI-7598] (#4720) 2022-12-15 10:54:24 +01:00
artoscinote fcc3a9b5d9
Merge pull request #4719 from artoscinote/ma_SCI_7569 
Fix table scroll wrapping [SCI-7569]
 2022-12-14 14:41:56 +01:00
Martin Artnik 3ea059529d Fix table scroll wrapping [SCI-7569] 2022-12-14 14:32:23 +01:00
Alex Kriuchykhin 766255e493
Merge pull request #4713 from okriuchykhin/ok_SCI_7577 
Improve user team invitation logic [SCI-7324]
 2022-12-13 16:14:48 +01:00
Oleksii Kriuchykhin 9900b62e03 Improve hadling of unaccessible inventories in snapshot versions sidebar [SCI-7577] 2022-12-13 16:12:08 +01:00
aignatov-bio 96aea292fb
Merge pull request #4714 from aignatov-bio/ai-sci-7579-experiment-card-fixes 
Fix experiment cards views [SCI-7579]
 2022-12-13 15:09:07 +01:00
Anton 8e1e95b219 Add new step text notification [SCI-7559] 2022-12-13 14:47:53 +01:00
Anton 66d21e9c4f Fix experiment cards views [SCI-7579] 2022-12-13 13:14:51 +01:00
Oleksii Kriuchykhin 89258ce2ae Improve user team invitation logic [SCI-7577] 2022-12-13 11:34:56 +01:00
Anton d85e1e9d6c Fix divider on project/experiment view [SCI-7586] 2022-12-13 10:01:38 +01:00
Anton abee54699d Fix label template error handling [SCI-7572] 2022-12-12 15:21:15 +01:00
G-Chubinidze 0b27f0d973
Merge branch 'features/new_experiment_views' into gc_SCI_7496 2022-12-12 17:53:22 +04:00
G-Chubinidze 10f31c8796
Merge pull request #4687 from G-Chubinidze/gc_SCI_7442 
BE: Column display switch (Task data display) [SCI-7442]
 2022-12-12 17:51:58 +04:00
Giga Chubinidze 477066f85e code logic cleanup 2022-12-12 17:51:05 +04:00
Anton 6b6105dfe6 CSS fixes for exposed ID [SCI-7586] 2022-12-12 11:45:59 +01:00
aignatov-bio d596746893
Merge pull request #4702 from aignatov-bio/ai-sci-7581-fix-long-protocol-name-in-task-flyout 
Fix long protocol name in task protocol flyout [SCI-7581]
 2022-12-12 11:09:52 +01:00
Alex Kriuchykhin 67e4a7f658
Merge pull request #4706 from okriuchykhin/ok_SCI_7393 
Remove underscore escaping for ZPL templates previews [SCI-7393]
 2022-12-12 11:00:37 +01:00
Alex Kriuchykhin 67b6cd6ae9
Merge pull request #4700 from okriuchykhin/ok_SCI_7564 
Fix search by ID for project cards [SCI-7564]
 2022-12-12 10:34:39 +01:00
Oleksii Kriuchykhin 925d7e5c45 Remove underscore escaping for ZPL templates previews [SCI-7393] 2022-12-12 10:28:35 +01:00
aignatov-bio d3fee7eee0
Merge pull request #4691 from okriuchykhin/ok_SCI_7551 
Add img2zpl gem for ZPL image code generation [SCI-7551]
 2022-12-09 14:28:15 +01:00
aignatov-bio c2e8abb4a4
Merge pull request #4705 from aignatov-bio/ai-sci-7583-fix-protocol-id-on-task-page 
Fix protocol id on task page [SCI-7583]
 2022-12-09 14:07:20 +01:00
aignatov-bio 66b0968b66
Merge pull request #4696 from aignatov-bio/ai-sci-7552-add-company-logo-to-label-templates 
Add logo to label templates [SCI-7552]
 2022-12-09 13:36:27 +01:00
Anton c5d91b061b Add logo to label templates 2022-12-09 13:33:10 +01:00
Anton 0736a02741 Fix protocol id on task page [SCI-7583] 2022-12-09 12:56:24 +01:00