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

2766 commits

Author SHA1 Message Date
Anton 94f8d139a1 Fix experiments sidebar sorting [SCI-7894] 2023-02-07 13:35:00 +01:00
artoscinote db75d1cb34
Merge pull request #4938 from sboursen-scinote/sb_SCI-7831 
No warning message on modal, when importing existing protocol from protocols.io into My Protocols [SCI-7831]
 2023-02-06 16:59:08 +01:00
aignatov-bio bfb035d339
Merge pull request #4936 from aignatov-bio/ai-sci-7834-save-handson-table-metadata 
Save handson table metadata [SCI-7834]
 2023-02-06 14:24:51 +01:00
Anton 3849b1a7a1 Save handson table metadata [SCI-7834] 2023-02-06 14:21:55 +01:00
sboursen-scinote 93851b8c90 Fix code style issues [SCI-7831] 2023-02-06 13:49:34 +01:00
sboursen-scinote 9023e8d1d4 Standarize the returned json when the request is not succesful [SCI-7831] 2023-02-06 13:31:11 +01:00
artoscinote d9beafd9a7
Merge pull request #4903 from sboursen-scinote/sb_SCI-7676 
CSS: error messages at moving experiment [SCI-7676]
 2023-02-06 11:12:45 +01:00
Alex Kriuchykhin 15ac306244
Fix user auto linking with Azure AD [SCI-7764] (#4924) 2023-02-02 13:27:49 +01:00
Alex Kriuchykhin dadb2fdf06
Merge pull request #4909 from okriuchykhin/ok_SCI_7816 
Fix date time inventories reminder processing [SCI-7816]
 2023-02-01 16:26:54 +01:00
Oleksii Kriuchykhin e887e7c82b Merge branch 'develop' into features/sso-improvements 2023-02-01 16:08:56 +01:00
Alex Kriuchykhin 94806047c0
Make SSO feature switchable [SCI-7764] (#4916) 2023-02-01 15:43:20 +01:00
artoscinote c88e63f8d9
Merge pull request #4893 from G-Chubinidze/gc_SCI_7813 
Lost sorting selection on experiment table view [SCI-7813]
 2023-02-01 09:30:27 +01:00
Alex Kriuchykhin e1c4aa9469
Move Okta and Azure AD configurations to application settings [SCI-7609] (#4732) 2023-01-31 11:55:31 +01:00
Oleksii Kriuchykhin fa96a9a939 Fix date time inventories reminder processing [SCI-7816] 2023-01-30 17:07:27 +01:00
sboursen-scinote 42eae72d2a Update the layout of the move-experiment-modal when there are errors [SCI-7676] 2023-01-30 12:00:33 +01:00
Alex Kriuchykhin e7c61d6fd9
Fix smart annotation inventory items flyout, case with no available inventories [SCI-7824] (#4898) 2023-01-27 14:16:52 +01:00
Giga Chubinidze 1fbce23788 Lost sorting selection on experiment table view [SCI-7813] 2023-01-26 17:00:03 +04:00
Alex Kriuchykhin 7e1d1ffd99
Fix editing of existing reports [SCI-7817] (#4886) 
Co-authored-by: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
 2023-01-25 15:41:59 +01:00
Alex Kriuchykhin f455b8fb32
Merge pull request #4784 from okriuchykhin/ok_SCI_7703 
Improve handling of db locks [SCI-7703]
 2023-01-18 10:24:52 +01:00
Oleksii Kriuchykhin 3a85cdde0a Improve handling of db locks [SCI-7703] 2023-01-17 17:30:20 +01:00
aignatov-bio 5cbaf83067
Merge pull request #4845 from aignatov-bio/ai-sci-7758-fix-user-designation-on-creation 
Fix user designation on task creation [SCI-7758]
 2023-01-17 15:12:46 +01:00
aignatov-bio 8a4599bed1
Merge pull request #4831 from aignatov-bio/ai-sci-7722-fix-new-task-modal-error-handling 
Fix error handling new task modal and completed task duplication [SCI-7722][SCI-7730]
 2023-01-17 13:34:13 +01:00
Anton 3b6590b8c7 Fix user designation on task creation [SCI-7758] 2023-01-17 13:33:04 +01:00
Anton 3eb18a7cf4 Fix error handling new task modal and completed task duplication[SCI-7722][SCI-7730] 2023-01-16 13:03:25 +01:00
Anton e48657768d Hide assigned users for user without permissions [SCI-7758] 2023-01-16 11:28:47 +01:00
ajugo 56fb8a4efa
Fix hoover tooltip for company logo [SCI-7766] (#4827) 2023-01-16 10:23:34 +01:00
sboursen-scinote 622e937ca3 Remove redundant activerecord query methodes and rename the reconnnect function [SCI-7732] 2023-01-13 17:14:00 +01:00
sboursen-scinote d55e7d256a Fix ruby style issues 2023-01-13 12:57:35 +01:00
sboursen-scinote 5d6905564e Merge branch 'develop' into sb_SCI_7732 2023-01-13 12:49:47 +01:00
sboursen-scinote b37a8d1c18 Fix connection is lost after a connected task is archived [SCI-7732] 2023-01-13 12:48:36 +01:00
ajugo 8303265361
Fix switching between experiment views [SCI-7756] (#4813) 2023-01-13 10:15:48 +01:00
aignatov-bio 9216ca2809
Merge pull request #4811 from aignatov-bio/ai-sci-7722-add-new-task-modal-improvments 
Experiment table - add new task modal improvements [SCI-7722]
 2023-01-13 10:13:22 +01:00
Anton 7930091abb Experiment table - add new task modal improvments [SCI-7722] 2023-01-12 13:48:49 +01:00
ajugo 7f64b22a3a
Fix task duplication for experiment table view for User role [SCI-7731] (#4803) 
* Fix task duplication for experiment table view for User role [SCI-7731]

* Move created_by for clone batch [SCI-7731]
 2023-01-12 13:29:44 +01:00
aignatov-bio abaf8d9e07
Merge pull request #4806 from aignatov-bio/ai-sci-7746-fix-due-date-ordering 
Experiment table improve due date sorting [SCI-7746][SCI-7704]
 2023-01-12 12:58:18 +01:00
ajugo 224fb5b742
Fix moving of experiment [SCI-7734] (#4802) 2023-01-12 12:10:06 +01:00
ajugo c0554009d7
Fix redirection path for experiment duplication [SCI-7682] (#4800) 2023-01-12 12:08:37 +01:00
aignatov-bio 826aa614e3
Fix task duplication on experiment table [SCI-7730] (#4794) 2023-01-12 12:07:12 +01:00
Anton 3dff1b8a8c Experiment table improve due date sorting [SCI-7746][SCI-7704] 2023-01-12 11:57:48 +01:00
ajugo 67dcbb0fa6
Open the correct experiment view [SCI-7662][SCI-7741] (#4798) 
* Fix experiment view loading [SCI-7662]

* Fix experiment view loading [SCI-7662]
 2023-01-12 11:31:04 +01:00
Anton e38c45314b Update sidebar along with experiment table [SCI-7704] 2023-01-10 13:45:15 +01:00
artoscinote 288c255c44
Merge pull request #4776 from artoscinote/ma_SCI_7653 
Fix display of archived tasks [SCI-7653]
 2023-01-10 11:56:48 +01:00
ajugo ef8b8344fd
Saving selected experiment view [SCI-7662] (#4779) 2023-01-10 11:08:49 +01:00
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
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
Oleksii Kriuchykhin b29aeab67a Add API endpoint for retrieving a list of users [SCI-7455] 2023-01-06 16:33:00 +01:00