Commit graph

987 commits

Author SHA1 Message Date
Soufiane
c88e2df19c
Fix filter_date action when only one date is present [SCI-7942] (#5005)
Fix filter_date action when only one date is present [SCI-7942]
2023-02-21 14:36:24 +01:00
Soufiane
77d4a33829
Fix the undefined method issue for activity subjects [SCI-7942] (#4994) 2023-02-20 11:49:27 +01:00
Alex Kriuchykhin
7f8f723cbe
Fix handling of ISS in Azure configuration, fix linked accounts page [SCI-7923] (#4974) 2023-02-14 16:50:15 +01:00
ajugo
dc8b147282
Add handson table metadata to reports [SCI-7835] (#4956)
* Add handson table metadata to reports [SCI-7835]

* Fix step table loading for empty metadata [SCI-7835]
2023-02-13 11:32:18 +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
sboursen-scinote
1614e3e52b Fix hound [SCI-7831] 2023-02-06 16:42:48 +01:00
sboursen-scinote
2fc5772af3 Catch RecordInvalid errors and remove uneeded error_format function [SCI-7831] 2023-02-06 16:36:52 +01:00
sboursen-scinote
93851b8c90 Fix code style issues [SCI-7831] 2023-02-06 13:49:34 +01:00
sboursen-scinote
c39b660fe3 Format error before sending it from back-end [SCI-7831] 2023-02-06 13:29:15 +01:00
artoscinote
2af2479808
Merge pull request #4937 from artoscinote/ma_SCI_6359
Fix multiple route helper incluions [SCI-6359]
2023-02-06 13:08:04 +01:00
Martin Artnik
7c6cca0615 Fix multiple route helper incluions [SCI-6359] 2023-02-06 13:03:12 +01:00
ajugo
5104dab5b4
Show parent id for inventory snapshot items in exported excel [SCI-7671] (#4907) 2023-02-06 11:18:19 +01:00
ajugo
6fcb9152dc
Fix CSS for generated pdf/docx reports [SCI-7660] (#4911)
* Fix CSS for generated pdf/docx reports [SCI-7660]

* Call correct asset previewable function [SCI-7660]
2023-02-01 12:01:18 +01:00
Alex Kriuchykhin
00d99ee296
Fix user assigning to teams with existing team sharing records [SCI-7720] (#4879) 2023-01-24 15:47:53 +01:00
Martin Artnik
0304daef7d Cast rgb() formatted css colors to hex for DOCX [SCI-7796] 2023-01-19 15:50:59 +01:00
Alex Kriuchykhin
1ac86b8188
Merge pull request #4832 from okriuchykhin/ok_SCI_7638
Improve loading speed of inventory table [SCI-7638]
2023-01-18 11:39:52 +01:00
Oleksii Kriuchykhin
e51cf28ec6 Improve loading speed of inventory table [SCI-7638] 2023-01-18 11:10:43 +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
Alex Kriuchykhin
91d5e9a72c
Merge pull request #4839 from okriuchykhin/team_deletion_fix
Fix team data deletion, add user assignments deletion for PET
2023-01-17 13:24:50 +01:00
ajugo
bf5e0da17a
Fix field codes dropdown for label templates [SCI-7770] (#4837) 2023-01-17 12:50:17 +01:00
Oleksii Kriuchykhin
2d8392f6c0 Fix team data deletion, add user assignments deletion for PET 2023-01-16 15:10:15 +01:00
ajugo
56fb8a4efa
Fix hoover tooltip for company logo [SCI-7766] (#4827) 2023-01-16 10:23:34 +01:00
ajugo
1e01d1f2b7
Fix missing translation for field codes [SCI-7765] (#4826) 2023-01-16 10:21:10 +01:00
Alex Kriuchykhin
d4b0f0da9d
Merge pull request #4819 from scinote-eln/features/label-template-logo
Features/label template logo
2023-01-13 11:58:01 +01:00
ajugo
4b3b88fad8
Fix task access modal for user role [SCI-7712] (#4817) 2023-01-13 11:50:42 +01:00
aignatov-bio
d93268f920
Merge pull request #4808 from aignatov-bio/ai-sci-7744-experiment-table-fix-results-counter
Experiment table fix results counter [SCI-7744]
2023-01-12 13:30:25 +01:00
Anton
2f6312de11 Experiment table fix results counter [SCI-7744] 2023-01-12 13:19:32 +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
769b5bc815
Fix task access modal for viewer role [SCI-7712] (#4789) 2023-01-12 12:15:29 +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
artoscinote
4ecf208243
Merge pull request #4780 from artoscinote/ma_SCI_7683
Fix task access modal for archived experiments [SCI-7683]
2023-01-10 11:51:47 +01:00
ajugo
1fe39a216c
Fix tag display in experiment table for viewer role [SCI-7696] (#4781) 2023-01-10 11:09:23 +01:00
Martin Artnik
da5324d2a1 Fix task access modal for archived experiments [SCI-7683] 2023-01-09 16:04:57 +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
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
c513e6bca7 Experiment table - fix comments view mode [SCI-7695] 2023-01-06 12:02:35 +01:00
Anton
802e0e602b Experiment table - fix view moda for assigned users [SCI-7693] 2023-01-06 11:44:48 +01:00
Anton
a98aad56db Fix task id in experiment table [SCI-7690] 2023-01-06 10:58:41 +01:00
ajugo
32e9329bcc
Fix user assign modal in experiment archived table view [SCI-7654] (#4742) 2023-01-05 12:00:12 +01:00
aignatov-bio
eaa7928617
Merge branch 'develop' into ai-sci-7167-update-repository-project-logic 2023-01-04 10:08:38 +01:00
Martin Artnik
1b4c209180 Fix syntax error [SCI-7368] 2022-12-23 15:03:02 +01:00
aignatov-bio
ea661f3c19
Merge branch 'develop' into features/new_experiment_views 2022-12-22 13:33:25 +01:00
Martin Artnik
45aad7f429 Fix duplicate entries for recent work [SCI-7641] 2022-12-20 14:32:22 +01:00
ajugo
41892e35c6
Fix docx report generator for links in activity [SCI-7598] (#4720) 2022-12-15 10:54:24 +01:00
Oleksii Kriuchykhin
89258ce2ae Improve user team invitation logic [SCI-7577] 2022-12-13 11:34:56 +01:00
Anton
abee54699d Fix label template error handling [SCI-7572] 2022-12-12 15:21:15 +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
Oleksii Kriuchykhin
925d7e5c45 Remove underscore escaping for ZPL templates previews [SCI-7393] 2022-12-12 10:28:35 +01:00