scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-25 01:16:31 +08:00
Code Issues Packages Projects Releases Wiki Activity
12809 commits 69 branches 179 tags 165 MiB
Commit graph

9994 commits

Author SHA1 Message Date
sboursen-scinote 697cf6f19a Fix hound [SCI-8108] 2023-03-13 14:52:54 +01:00
sboursen-scinote 25b88519f9 Fix broken dropdown footer [SCI-8108] 2023-03-13 14:45:54 +01:00
aignatov-bio 946ea47d55
Fix xss for titles in tags labels [SCI-8133] (#5130) 2023-03-13 14:39:12 +01:00
ajugo 1b9b10ccfb
Fix clickaway filtering for empty filter states [SCI-8103] (#5122) 2023-03-13 13:04:23 +01:00
Giga Chubinidze 3d11400311 Archived experiments UI improvements [SCI-8086] 2023-03-13 15:12:40 +04:00
G-Chubinidze 2cef3bde31
Merge pull request #5119 from G-Chubinidze/gc_SCI_8081 
Display the ID of the parent protocol in reports [SCI-8081]
 2023-03-13 14:49:36 +04:00
G-Chubinidze 31b051d03f
Merge pull request #5126 from G-Chubinidze/gc_SCI_8100 
CSS: Pixel-perfect issues for Protocol templates [SCI-8100]
 2023-03-13 14:44:18 +04:00
Giga Chubinidze ca8375a867 hound fixes 2023-03-13 14:36:49 +04:00
sboursen-scinote 59f4768c4e Match the styles of the authors and the keywords to figma [SCI-8108] 2023-03-13 11:32:11 +01:00
Giga Chubinidze b59f922143 CSS: Pixel-perfect issues for Protocol templates [SCI-8100] 2023-03-13 14:25:04 +04:00
sboursen-scinote 4afac52ad3 Fix spacing issue in protocol datatable [SCI-8108] 2023-03-13 10:56:26 +01:00
Alex Kriuchykhin d285a0a9db
Preserve old protocol types for backward compatibility, fix protocol draft user permissions [SCI-8083] (#5123) 2023-03-13 09:55:53 +01:00
sboursen-scinote 30d782d8bb Fix spacing issue in protocol details [SCI-8108] 2023-03-13 08:55:15 +01:00
sboursen-scinote d2ceeb9662 Use I18n [SCI-8007] 2023-03-12 14:10:07 +01:00
Alex Kriuchykhin fcfe8d81cb
Fix read-only experiment access modal display [SCI-8040] (#5118) 2023-03-10 15:03:11 +01:00
Alex Kriuchykhin cb1c49762a
Revert "Protocol permissions - button display [SCI-8058]" (#5121) 2023-03-10 11:45:32 +01:00
sboursen-scinote ce3fbfe4eb Sanitize datatable params [SCI-8007] 2023-03-10 11:33:28 +01:00
sboursen-scinote e9bdd218fa Sanitize te user_names_with_roles [SCI-8007] 2023-03-10 09:46:45 +01:00
sboursen-scinote 55ebb4817e Fix hound [SCI-8007] 2023-03-10 09:16:50 +01:00
sboursen-scinote 506c750eee Use datatable ajax to send version param [SCI-8007] 2023-03-09 21:59:14 +01:00
Giga Chubinidze 4cc953663f Display the ID of the parent protocol in reports [SCI-8081] 2023-03-10 00:08:07 +04:00
sboursen-scinote c4bdbdec9a Merge branch 'features/protocol_versioning' into sb_SCI-8007 2023-03-09 16:35:36 +01:00
Soufiane 9b444cd8fb
Merge pull request #5110 from sboursen-scinote/sb_SCI-8045 
CSS bugs for "Protocol templates" [SCI-8045]
 2023-03-09 16:30:46 +01:00
sboursen-scinote a419943e4e Merge 'protocol_versioning' into sb_SCI-8045 2023-03-09 16:29:40 +01:00
sboursen-scinote e314dd4f51 Use I18n [SCI-8045] 2023-03-09 16:07:24 +01:00
G-Chubinidze f6ee2e821c
Merge pull request #5107 from G-Chubinidze/gc_SCI_8058 
Protocol permissions - button display [SCI-8058]
 2023-03-09 19:02:42 +04:00
aignatov-bio 376aa26ac5
Clear name on protocol create modal open [SCI-8003] (#5113) 2023-03-09 15:57:05 +01:00
ajugo b1468df3e1
Fix checkboxes at the protocol template table [SCI-8099] (#5108) 2023-03-09 15:01:21 +01:00
aignatov-bio 90ea8425ff
Merge pull request #5109 from rekonder/aj_SCI_8111 
Fix loading of protocols.io to protocol templates [SCI-8111]
 2023-03-09 14:54:18 +01:00
artoscinote bc6afa5efa
Merge pull request #5114 from artoscinote/ma_SCI_8109 
Fix protocol link and step delete modal styling [SCI-8109]
 2023-03-09 14:53:21 +01:00
aignatov-bio a50f5d270c
Merge pull request #5116 from aignatov-bio/ai-sci-8063-add-all-team-members-through-access-modal 
Add all team members through access modal [SCI-8063]
 2023-03-09 14:48:40 +01:00
Alex Kriuchykhin 4aded6e7b4
Fix protocol filtering by pablished attributes and draft presence [SCI-8070] (#5099) 2023-03-09 14:46:43 +01:00
Anton ca5f61a0e2 Add all team members through access modal [SCI-8063] 2023-03-09 14:13:01 +01:00
Martin Artnik ca4a5360ed Fix protocol link and step delete modal styling [SCI-8109] 2023-03-09 13:53:52 +01:00
artoscinote 2d0a6c387c
Merge pull request #5103 from artoscinote/ma_SCI_8039 
Update access modal sizing [SCI-8039]
 2023-03-09 13:13:22 +01:00
Alex Kriuchykhin 87153b8899
Improve filtering of user supplied data in the input and text fields [SCI-8095] (#5106) 2023-03-09 11:38:47 +01:00
sboursen-scinote 7e58eff8de Fix hound [SCI-8045] 2023-03-08 20:56:22 +01:00
sboursen-scinote 19d58789b3 Fix protocol details [SCI-8045] 2023-03-08 20:51:47 +01:00
Andrej b5c3491a38 Fix loading of protocols.io to protocol templates [SCI-8111] 2023-03-08 19:10:22 +01:00
G-Chubinidze 32d1c2cf6d
Merge branch 'features/protocol_versioning' into gc_SCI_8058 2023-03-08 21:15:36 +04:00
Giga Chubinidze 553c644811 Protocol permissions - button display [SCI-8058] 2023-03-08 21:12:29 +04:00
sboursen-scinote 45f3d05fdc Fix hound [SCI-8007] 2023-03-08 16:31:24 +01:00
sboursen-scinote b3f7c41548 Update the filter dropDown globaly [SCI-8007] 2023-03-08 16:25:10 +01:00
Martin Artnik 69dbc036de Display ID of original protocol in linked protocol info [SCI-8106] 2023-03-08 15:48:03 +01:00
sboursen-scinote 4ec15ede61 Implement the linked_children dropdown and update the modal [SCI-8007] 2023-03-08 15:15:41 +01:00
Martin Artnik e6af78112c Update access modal sizing [SCI-8039] 2023-03-08 15:03:09 +01:00
aignatov-bio 0a3efe3e24
Merge pull request #5101 from aignatov-bio/ai-sci-8067-fix-protocol-repository-sorting-by-assigned-users 
Fix protocols sorting by assigned users [SCI-8074]
 2023-03-08 14:12:52 +01:00
Anton fd44cc9778 Fix protocols sorting by assigned users [SCI-8074] 2023-03-08 12:22:46 +01:00
ajugo 86092e08fb
Remove not needed user roles on protocol access modals [SCI-8031] (#5098) 2023-03-08 12:10:36 +01:00
sboursen-scinote a25a49a051 Merge branch 'features/protocol_versioning' into sb_SCI-8007 2023-03-08 11:36:22 +01:00
artoscinote 66ec451d5e
Merge pull request #5096 from artoscinote/ma_SCI_8093 
Add draft created activity [SCI-8093]
 2023-03-08 10:49:45 +01:00
artoscinote b8c5323fdc
Merge pull request #5094 from artoscinote/ma_SCI_8038 
PET access modal fixes [SCI-8038]
 2023-03-08 10:49:30 +01:00
aignatov-bio 7a54856a54
Merge pull request #5095 from aignatov-bio/ai-sci-8074-fix-protocol-duplication 
Fix protocol duplication table reload [SCI-8074]
 2023-03-08 10:15:19 +01:00
Martin Artnik 6cc78790b0 Fix title for archived protocols table [SCI-8092] 2023-03-07 14:55:11 +01:00
Martin Artnik e4e8997cc1 Add draft created activity [SCI-8093] 2023-03-07 14:45:52 +01:00
Anton 2a794b68ac Fix protocol duplication table reload [SCI-8074] 2023-03-07 14:31:15 +01:00
ajugo 078f4583ec
Fix content of the Load from templates table [SCI-8049] (#5088) 2023-03-07 14:19:29 +01:00
Alex Kriuchykhin bee0fa2de9
Fix protocols re-assigning when removing user from a team [SCI-8034] (#5069) 2023-03-07 14:15:49 +01:00
Soufiane f22f00f856
Merge pull request #5067 from sboursen-scinote/sb_SCI-8032 
Old buttons at importing protocols.io protocol [SCI-8032]
 2023-03-07 14:13:02 +01:00
aignatov-bio ce36a2565b
Merge pull request #5092 from aignatov-bio/ai-sci-8077-add-empty-state-for-protocol-actions-toolbar 
Add empty state for protocol actions toolbar [SCI-8077]
 2023-03-07 14:09:18 +01:00
aignatov-bio ff4ef31ebf
Merge pull request #5091 from aignatov-bio/ai-sci-8079-fix-print-button-on-protocol-show-page 
Fix print protocol button on protocol show page [SCI-8079]
 2023-03-07 14:09:08 +01:00
Martin Artnik 22c039fc77 PET access modal fixes [SCI-8038] 2023-03-07 14:04:05 +01:00
Alex Kriuchykhin f8a4e7ee65
Update logic for linked protocol templates with task [SCI-7973] (#5058) 2023-03-07 13:03:01 +01:00
Soufiane d801677392
Merge branch 'develop' into sb_SCI-7562 2023-03-07 12:52:05 +01:00
G-Chubinidze 3cd4d9f760
Merge pull request #5077 from G-Chubinidze/gc_SCI_7954 
Archived protocol template navigation, icon, button [SCI-7954]
 2023-03-07 15:51:51 +04:00
Soufiane 1d80118393
Merge pull request #5035 from sboursen-scinote/sb_SCI-7996 
Fix protocols repository table CSS [SCI-7996]
 2023-03-07 12:50:10 +01:00
Anton ece09ee9a5 Add empty state for protocol actions toolbar [SCI-8077] 2023-03-07 11:44:03 +01:00
ajugo 6471dbed5b
Fix missing team at the StepTable creation [SCI-8036] (#5090) 2023-03-07 11:26:57 +01:00
Anton 25050cb6cc Fix print protocol button on protocol show page [SCI-8079] 2023-03-07 11:25:59 +01:00
Alex Kriuchykhin b9193748fa
Fix view access modals [SCI-8040] (#5084) 2023-03-07 11:17:56 +01:00
sboursen-scinote 6a885d4023 Fix avatars and tooltip in access column [SCI-8007] 2023-03-07 11:02:03 +01:00
aignatov-bio e090bdf443
Merge pull request #5089 from aignatov-bio/ai-sci-8004-fix-archive-restore-propagation 
Fix archive/restore propagation [SCI-8004]
 2023-03-07 10:59:24 +01:00
artoscinote 5407943bfd
Merge pull request #5083 from artoscinote/ma_SCI_8039 
Protocol/general user assignment changes and fixes [SCI-8039][SCI-8037]
 2023-03-07 10:55:37 +01:00
aignatov-bio e7afc70cab
Merge pull request #5086 from aignatov-bio/ai-sci-8003-fix-wording-for-same-protocol-name 
Fix protocol creation error message [SCI-8003]
 2023-03-07 10:48:12 +01:00
Anton 55dca41434 Fix archive/restore propagation [SCI-8004] 2023-03-07 10:44:44 +01:00
Alex Kriuchykhin 8956d72f12
Switch to showing of total sum of all versions in protocols table [SCI-8066] (#5082) 2023-03-07 09:58:36 +01:00
aignatov-bio 1d9785efbe
Fix version button at action toolbar [SCI-8065] (#5085) 2023-03-07 09:52:31 +01:00
Alex Kriuchykhin 0ab89db29c
Fix protocol Publish button behaviour after canceling of publish action [SCI-8068] (#5081) 2023-03-07 09:49:21 +01:00
Alex Kriuchykhin 00c602a818
Improve filtering in protocols datatable [SCI-8020] (#5068) 2023-03-07 09:42:18 +01:00
sboursen-scinote 3612780606 Fix wrong icon [SCI-8007] 2023-03-07 07:07:51 +01:00
sboursen-scinote 5e89f1f829 Update my_module protocol status dropdown [SCI-7991] 2023-03-07 05:48:20 +01:00
Giga Chubinidze 4a02a130f0 Archived protocol template navigation, icon, button [SCI-7954] 2023-03-06 23:44:47 +04:00
Anton ca76c78a23 Fix protocol creation error message [SCI-8003] 2023-03-06 19:31:45 +01:00
Martin Artnik 2f29477e02 Protocol/general user assignment changes and fixes [SCI-8039] 2023-03-06 16:43:46 +01:00
artoscinote b2cf5548f6
Merge pull request #5071 from artoscinote/ma_SCI_8060 
Ensure user assignments stay in sync with protocol versions [SCI-8060]
 2023-03-06 16:12:05 +01:00
Martin Artnik cfcb80f642 Fix assignment sync to new protocol drafts and deletion [SCI-8060] 2023-03-06 16:06:38 +01:00
sboursen-scinote 03dc93b9b1 Remove outline on protocol otion [SCI-8045] 2023-03-06 14:24:02 +01:00
sboursen-scinote 34f324f7ca Update the sort component [SCI-8045] 2023-03-06 12:00:53 +01:00
ajugo 9d4e212c7d
Fix protocol template access filter [SCI-7988] (#5073) 2023-03-06 11:50:37 +01:00
ajugo 9379d9a175
Fix load protocol to task [SCI-8072] (#5070) 2023-03-06 10:53:01 +01:00
G-Chubinidze 78c04a3ce0
Merge pull request #5078 from G-Chubinidze/gc_SCI_8054 
CSS: Incorrect paddings in the "Protocol info" modal [SCI-8054]
 2023-03-06 13:28:12 +04:00
sboursen-scinote 587606803b Update search placeholder [SCI-8045] 2023-03-06 09:28:21 +01:00
sboursen-scinote e325458f2e Add hover effect on datatable columns headers [SCI-8045] 2023-03-06 08:32:55 +01:00
sboursen-scinote 676eb96d00 Fix linked tasks column title [SCI-8045] 2023-03-06 08:25:46 +01:00
Giga Chubinidze 3fd7937154 CSS: Incorrect paddings in the "Protocol info" modal [SCI-8054] 2023-03-05 02:25:25 +04:00
Giga Chubinidze ecf27c679e Incorrect bottom action bar states for Protocol templates [SCI-8008] 2023-03-04 23:03:41 +04:00
aignatov-bio d99957d8a1
Merge branch 'features/protocol_versioning' into ai-sci-8021-fix-modifier-name-for-drafts 2023-03-03 20:50:46 +01:00
aignatov-bio 96ee59b185
Merge pull request #5075 from aignatov-bio/ai-sci-8075-fix-draft-creation-validation 
Fix draft creation [SCI-8075]
 2023-03-03 20:49:42 +01:00
sboursen-scinote 678e54bdc4 Add hover effect on datatable head [SCI-7562] 2023-03-03 16:27:54 +01:00
sboursen-scinote f6ce634d1c Use ordinary cursor [SCI-7562] 2023-03-03 16:17:23 +01:00
sboursen-scinote c036c72243 Fix hound [SCI-7996] 2023-03-03 16:00:50 +01:00
sboursen-scinote 9e33fae006 Make table cell single lined and limit the max width [SCI-7996] 2023-03-03 15:59:29 +01:00
Anton b4b5b70331 Fix draft creation [SCI-8075] 2023-03-03 15:51:36 +01:00
aignatov-bio da31883ac3
Add error handling to actions in protocol controller [SCI-8073] (#5074) 2023-03-03 15:33:08 +01:00
sboursen-scinote 248b13aa72 Fix hound [SCI-8030] 2023-03-03 14:32:08 +01:00
sboursen-scinote 443ee4350c Fix protocol repository sidebar on archived view [SCI-8030] 2023-03-03 14:11:40 +01:00
Martin Artnik 73ed75a73a Ensure user assignments stay in sync with protocol versions [SCI-8060] 2023-03-03 13:20:15 +01:00
sboursen-scinote 0cd31d451d Fix hound [SCI-8032] 2023-03-03 11:06:12 +01:00
ajugo 8b1bc51950
Fix loading of i icon on protocol [SCI-8051] (#5061) 2023-03-03 09:55:42 +01:00
sboursen-scinote c3066292a0 Style the protocol-preview-modal [SCI-8032] 2023-03-03 09:17:09 +01:00
sboursen-scinote 80b3863efa Render protocol-preview-modal independently on protocolio-modal [SCI-8032] 2023-03-03 09:02:17 +01:00
sboursen-scinote c93c8b4c5b Update full-preview-panel data id on protocol-card change [SCI-8032] 2023-03-03 09:00:12 +01:00
sboursen-scinote 8460fe3693 Implement the grant access to all team members functionality [SCI-8032] 2023-03-03 08:58:41 +01:00
Alex Kriuchykhin 4fb18a8018
Fix save as draft action [SCI-8068] (#5066) 2023-03-02 16:10:28 +01:00
artoscinote a43bd9d7f9
Merge pull request #5065 from artoscinote/ma_SCI_8059 
Fix display of unauthorized error on protocol page [SCI-8059]
 2023-03-02 15:46:10 +01:00
ajugo ed90c912f6
Add description to cloned protocol template from protocol [SCI-8053] (#5063) 2023-03-02 15:35:18 +01:00
ajugo 72cf844c3e
Fix protocol version modification info text [SCI-8061] (#5064) 2023-03-02 15:35:02 +01:00
Martin Artnik 72831cd015 Fix display of unauthorized error on protocol page [SCI-8059] 2023-03-02 15:05:50 +01:00
aignatov-bio 25644ab5a3
Fix version number for draft created from old versions [SCI-8023] (#5040) 2023-03-02 14:34:14 +01:00
ajugo 3bdc8feaee
Fix protocol name field editability [SCI-8033] (#5053) 2023-03-02 13:50:47 +01:00
Anton b68291c834 Fix protocol vue component loading [SCI-8024] 2023-03-02 11:33:40 +01:00
ajugo a31a1778cf
Add new protocol modal on dashboard [SCI-8042] (#5057) 2023-03-02 09:57:08 +01:00
artoscinote 093c3d63f1
Merge pull request #5059 from G-Chubinidze/gc_SCI_7844 
Add the action Move to archived task & experiments view [SCI-7844]
 2023-03-02 09:01:21 +01:00
Giga Chubinidze 780781e57b Add the action Move to archived task & experiments view [SCI-7844] 2023-03-02 11:35:22 +04:00
Alex Kriuchykhin 420b07440d
Fix inventory copying for shared inventories [SCI-7998] (#5025) 2023-03-01 17:22:53 +01:00
Martin Artnik d71c14e2eb Add missing prism.js includes to layout [SCI-7974] 2023-03-01 15:21:01 +01:00
Anton 4eab2c25f3 Save last_modified_by on protocol update [SCI-8021] 2023-03-01 15:19:34 +01:00
Alex Kriuchykhin 9908b31d11
Fix protocols datatable [SCI-7984] (#5046) 2023-03-01 15:04:53 +01:00
ajugo 976ddca672
Disable save as draft if draft exists [SCI-8025] (#5049) 2023-03-01 14:41:41 +01:00
artoscinote 3b074a4af6
Merge pull request #5044 from artoscinote/ma_SCI_7974 
Replace highlight.js with prism.js [SCI-7974]
 2023-03-01 12:52:57 +01:00
artoscinote 434403c80c
Merge pull request #5029 from G-Chubinidze/gc_SCI_7763 
Search by team does not work [SCI-7763]
 2023-03-01 12:49:11 +01:00
artoscinote 4a65a9e55e
Merge pull request #4949 from sboursen-scinote/sb_SCI-7237 
Improve the print functionality for protocol [SCI-7237]
 2023-03-01 12:48:39 +01:00
ajugo e317ca0134
Fix deleting draft for the first time [SCI-8022] (#5048) 2023-03-01 12:02:00 +01:00
aignatov-bio e16a8f033b
Merge pull request #5047 from aignatov-bio/ai-sci-8028-fix-protocol-versioning-sorting 
Protocol table fix sorting with archived columns [SCI-8028]
 2023-03-01 11:56:02 +01:00
Anton beb5f67508 Fix version modal 2023-03-01 11:44:22 +01:00
Anton 07cb17e296 Protocol table fix sorting with archived columns [SCI-8028] 2023-03-01 11:38:11 +01:00
ajugo b24c823597
Add linked_at to the Protocols [SCI-7964] (#5042) 
* Add linked_at to the Protocols [SCI-7964]

* Add activity subject_type constrain for migration query [SCI-7964]
 2023-03-01 11:33:32 +01:00
artoscinote 54de76342e
Merge pull request #5036 from sboursen-scinote/sb_SCI-7981 
Fix TOC style [SCI-7981]
 2023-03-01 09:47:56 +01:00
artoscinote 2829e46eae
Merge pull request #5024 from sboursen-scinote/sb_SCI-7938 
Position of newly added text/file/table to step [SCI-7938]
 2023-03-01 09:46:39 +01:00
aignatov-bio 922beecd74
Merge pull request #4959 from sboursen-scinote/sb_SCI-7772 
CSS:Uneven spacing around the check button [SCI-7772]
 2023-03-01 09:42:09 +01:00
Andrej 64da4c5368 Fix connected device model for request without device id [SCI-7972] 2023-02-28 16:42:56 +01:00
Martin Artnik 165e012d23 Replace highlight.js with prism.js [SCI-7974] 2023-02-28 16:22:35 +01:00
sboursen-scinote 88610d6b38 Add a small code refactor [SCI-7996] 2023-02-28 16:11:11 +01:00
sboursen-scinote b6ddb79183 Change the action-toolbar behavior after input from product team [SCI-7996] 2023-02-28 15:47:06 +01:00
Soufiane 2aee34ce56
Merge pull request #4955 from sboursen-scinote/sb_SCI-7904 
Protocol templates - delete all steps (tasks screen) [SCI-7904]
 2023-02-28 15:33:33 +01:00
Soufiane 53f2bc3be0
Merge pull request #4977 from sboursen-scinote/sb_SCI-7910 
Protocol templates - revert action and alert message [SCI-7910]
 2023-02-28 15:33:05 +01:00
aignatov-bio bce0c9549d
Merge pull request #5039 from aignatov-bio/ai-sci-8013-fix-protocol-long-name 
Fix protocol long name [SCI-8013]
 2023-02-28 15:21:18 +01:00
Anton 6c7a0d85c2 Fix protocol public assignments [SCI-8019] 2023-02-28 15:15:55 +01:00
sboursen-scinote e6c92fc328 Change only datatable styles related to protocol [SCI-7996] 2023-02-28 14:53:53 +01:00
artoscinote fab7d9c3d6
Merge pull request #5038 from artoscinote/ma_SCI_7990 
Fix protocol duplication in table [SCI-7990]
 2023-02-28 14:28:08 +01:00
Martin Artnik a3ffb38d2b Refactor cloning feature to better prepare for bulk clone [SCI-7990] 2023-02-28 14:22:02 +01:00
ajugo 96cf2f1d38
Update protocol templates update action on task [SCI-7903] (#5009) 
* Update protocol templates update action on task [SCI-7903]

* Simplify logic for update from parent [SCI-7903]
 2023-02-28 14:17:34 +01:00
artoscinote 6bfc88434e
Merge pull request #5041 from artoscinote/ma_SCI_7992 
Fix permission checks for protocols [SCI-7992]
 2023-02-28 14:15:07 +01:00
sboursen-scinote 1c9d9d8082 Add a small refactor [SCI-7910] 2023-02-28 14:13:18 +01:00
Martin Artnik b311f91bec Fix check for save as draft in version modal [SCI-7992] 2023-02-28 13:54:44 +01:00
Martin Artnik 7bf857a179 Fix permission checks for protocols [SCI-7992] 2023-02-28 13:48:29 +01:00
Martin Artnik 219814ec06 Change protocol clone to support bulk in future [SCI-7990] 2023-02-28 13:11:49 +01:00
sboursen-scinote 427690b236 Revert "Change the style of the header and footer borders [SCI-7904]" 
This reverts commit 1397b2b2e6.

revert styles
 2023-02-28 12:39:59 +01:00
sboursen-scinote 294152d90c Revert "Fix hound issues [SCI-7904]" 
This reverts commit e8cae5cc86.

Revert styles
 2023-02-28 12:39:42 +01:00
aignatov-bio 68cb18133f
Merge pull request #5027 from sboursen-scinote/sb_SCI-7991 
Versions button is not connected to the actions toolbar [SCI-7991]
 2023-02-28 12:09:14 +01:00
Anton cba85eb7fd Fix protoocl long name [SCI-8013] 2023-02-28 12:05:47 +01:00
sboursen-scinote 66edffe53a Use I18n [SCI-7910] 2023-02-28 12:03:00 +01:00
sboursen-scinote b99d9c485c Revert "Update the style of the unlink protocol modal [SCI-7909]" 
This reverts commit 0f9dcda99b.
 2023-02-28 11:51:42 +01:00
sboursen-scinote b482f4cfe9 Revert Unneded commits 
Modal styles are not part of the current ticket
 2023-02-28 11:50:32 +01:00
Martin Artnik bba9570228 Fix protocol duplication in table [SCI-7990] 2023-02-28 11:36:27 +01:00
sboursen-scinote 24e0fb6b48 Make it DRY [SCI-7991] 2023-02-28 10:39:56 +01:00
Giga Chubinidze 30e37a95d7 Add office file to task step - reload file option shows plain html page [SCI-7673] 2023-02-28 09:59:45 +04:00
sboursen-scinote 7d857fbc08 Fix TOC style [SCI-7981] 2023-02-27 21:54:57 +01:00
aignatov-bio 3735ba51b8
Fix protocol id on protocol show page [SCI-8005] (#5033) 2023-02-27 17:18:12 +01:00
aignatov-bio bda3661a9b
Fix duplicate keywords in protocol table [SCI-8009] (#5034) 2023-02-27 17:17:12 +01:00
sboursen-scinote 944e7123be Fix hound [SCI-7996] 2023-02-27 17:15:32 +01:00
sboursen-scinote 65c7a9fa95 Fix the rest of styles [SCI-7996] 2023-02-27 17:10:20 +01:00
sboursen-scinote e02705c3f1 Update actions toolbar styles [SCI-7996] 2023-02-27 16:14:45 +01:00
artoscinote e88b84000b
Merge pull request #5021 from artoscinote/ma_SCI_7978 
Protocol permission modal changes [SCI-7978]
 2023-02-27 13:34:32 +01:00
ajugo 0328a32e09
Update import/export for protocol templates [SCI-7986] (#5032) 2023-02-27 13:22:01 +01:00
G-Chubinidze 33bb7294f1
Merge pull request #5028 from G-Chubinidze/gc_SCI_7997 
Show delete button only for drafts [SCI-7997]
 2023-02-27 16:16:27 +04:00
Giga Chubinidze 59078e923b Show delete button only for drafts [SCI-7997] 2023-02-27 16:00:35 +04:00
aignatov-bio 68ba45728e
Merge pull request #5031 from aignatov-bio/ai-sci-8004-propagate-archived-flag-to-all-versions 
Propagate archived/flag to versions [SCI-8004]
 2023-02-27 12:52:11 +01:00
ajugo d26edb08df
Fix access filter and published by column [SCI-7988] (#5030) 2023-02-27 12:08:45 +01:00
Anton 9abc8489a6 Propagate archived/flag to versions [SCI-8004] 2023-02-27 11:12:40 +01:00
Alex Kriuchykhin 5de5d64be5
Update external protocol importer backend in order to work with new protocol versioning [SCI-7829] (#5017) 2023-02-27 10:37:51 +01:00
sboursen-scinote af48cede1f Update protocol repository default view styles [SCI-7996] 2023-02-27 09:58:28 +01:00
Giga Chubinidze 4d30e28112 Search by team does not work [SCI-7763] 2023-02-27 03:32:06 +04:00
Martin Artnik 3686844dac Add missing protocol default user role view [SCI-7978] 2023-02-24 18:28:19 +01:00
ajugo 95d04d11d2
Fix validation for multiple parent protocols for drafts [SCI-7994] (#5020) 
* Fix validation for multiple parent protocols for drafts [SCI-7994]

* Fix validation for drafts [SCI-7994]

* Fix validation for drafts [SCI-7994]
 2023-02-24 17:56:51 +01:00
aignatov-bio ced0da6dbc
Merge pull request #5026 from aignatov-bio/ai-sci-7989-fix-version-number-for-draft 
Fix version number for draft [SCI-7989]
 2023-02-24 17:52:37 +01:00
Martin Artnik 7357782144 Protocol validation fix [SCI-7978] 2023-02-24 17:28:36 +01:00
Martin Artnik 89459ae21a Protocol group assignment fixes [SCI-7978] 2023-02-24 17:24:25 +01:00
sboursen-scinote 548cdf9457 Open protocol versions modal when actions-toolbar button is clicked [sb_SCI-7991] 2023-02-24 16:23:23 +01:00
aignatov-bio 5ef110d985
Add version modal to protocol show page [SCI-7985] (#5018) 2023-02-24 16:17:36 +01:00
Anton 60cda9b6f2 Fix version number for draft [SCI-7989] 2023-02-24 15:32:10 +01:00
Alex Kriuchykhin b2ab467440
Improve loading time of current tasks widget [SCI-7999] (#5022) 
* Improve loading time of current tasks widget [SCI-7999]

* Improve speed of objects search for smart annotations editor [SCI-7999]
 2023-02-24 13:30:55 +01:00
sboursen-scinote 4ab8768024 Focus on newly added step element [sb_SCI-7938] 2023-02-24 10:49:18 +01:00
sboursen-scinote d42cd85533 Focus on newly added Attachment [sb_SCI-7938] 2023-02-24 10:48:47 +01:00
Anton dd27b13537 Fix protocol name validation [SCI-8003] 2023-02-24 10:15:23 +01:00
aignatov-bio 8906bc25e7
Fix version counting in protocol datatable [SCI-7993] (#5019) 2023-02-23 15:13:57 +01:00
Martin Artnik c24b0fa5ab Refactor access modals [SCI-7978] 2023-02-23 14:57:38 +01:00
Martin Artnik b0fc97a549 Fix assignable for top level assignables [SCI-7978] 2023-02-22 15:37:39 +01:00
Anton 826cb162da Add save as draft action 2023-02-22 14:59:48 +01:00
aignatov-bio 5d3e6b7226
Merge pull request #5007 from aignatov-bio/ai-sci-7717-protocol-new-activities 
Add new protocol activities [SCI-7717]
 2023-02-22 10:48:20 +01:00
Anton f7d7113239 Add new protocol activities [SCI-7717] 2023-02-22 10:46:24 +01:00
G-Chubinidze dac150f75f
Revert "Add office file to task step - reload file option shows plain html page [SCI-7673]" 2023-02-22 13:29:39 +04:00
Alex Kriuchykhin e020b4a416
Improve tags sanitization in smart annotations (#5008) 2023-02-21 16:53:04 +01:00
sboursen-scinote 2e76fb3788 Revert "Show a pagination active page button when the items datatable is empty [SCI-7783]" 
This reverts commit 65b75d0d55.

After Daily discussion, this is no longer regarded as an issue.
 2023-02-21 15:57:06 +01:00
Martin Artnik 13ba7c1ea5 Fix for scoll-to elements being hidden behind sticky navigation [SCI-7937] 2023-02-21 15:04:58 +01:00
ajugo 0be0aa7629
Implement filters for protocol template datatable [SCI-7605] (#4918) 
Implement filters for protocol template datatable [SCI-7605]
 2023-02-21 14:57:43 +01:00
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
Anton a95ca75362 Add new protocol modal [SCI-7810] 2023-02-21 14:15:53 +01:00
aignatov-bio ae607839c1
Merge pull request #5002 from aignatov-bio/ai-sci-7715-update-protocol-io-front-end 
Update protocolsIo front-end [SCI-7715]
 2023-02-21 14:06:42 +01:00
ajugo 166208f186
Update i flyouts of protocols (task screen) [SCI-7861] (#5003) 2023-02-21 13:44:26 +01:00
Martin Artnik 238354a314 Add back basic TinyMCE html editor [SCI-7965] 2023-02-21 11:23:52 +01:00
Anton c775a92914 Update protocolsIo front-end [SCI-7715] 2023-02-21 11:06:54 +01:00
sboursen-scinote 65468ea1ea Fix hound issues [SCI-7783] 2023-02-21 09:41:45 +01:00
artoscinote 8f8865c73c
Fix MarvinJS image toolbar issues [SCI-7934] (#4998) 2023-02-21 09:12:59 +01:00
sboursen-scinote 65b75d0d55 Show a pagination active page button when the items datatable is empty [SCI-7783] 2023-02-21 09:11:59 +01:00
Giga Chubinidze 34cfb14869 Rearrange of checklist items does not work after pasting several items at once [SCI-7935] 2023-02-21 10:44:28 +04:00
ajugo f26efe98a1
Fix grey navigator comment [SCI-7950] (#4997) 2023-02-20 16:24:39 +01:00
sboursen-scinote b7f71eafcb Add form label [SCI-7783] 2023-02-20 13:23:48 +01:00
ajugo c1f55e99a7
Fix protocol import for empty metadata [SCI-7915] (#4996) 2023-02-20 13:21:01 +01:00
sboursen-scinote 97a9cc4fef Align the label and the checkbox [SCI-7745] 2023-02-20 13:16:16 +01:00
Soufiane 77d4a33829
Fix the undefined method issue for activity subjects [SCI-7942] (#4994) 2023-02-20 11:49:27 +01:00
artoscinote 3ca007981b
Merge pull request #4993 from G-Chubinidze/gc_SCI_7673 
Add office file to task step - reload file option shows plain html page [SCI-7673]
 2023-02-20 10:37:03 +01:00
Giga Chubinidze 0ea7d6b75e changed axios to jquery, removed page refresh after file creation 2023-02-20 13:27:17 +04:00
ajugo 029f61e695
Disable gray canvas navigator [SCI-7950] (#4991) 2023-02-20 10:15:08 +01:00
ajugo 4515ab0a65
Fix expire_in method for unauthenticated user [SCI-7943] (#4983) 2023-02-20 10:14:46 +01:00
ajugo 461d06dad9
Fix import protocol [SCI-7915] (#4980) 2023-02-20 10:14:32 +01:00
ajugo 2c079cc918
Update protocol duplication [SCI-7900] (#4992) 2023-02-18 09:09:33 +01:00
aignatov-bio c92faeb48c
Merge pull request #4987 from aignatov-bio/ai-sci-7948-fix-cell-allignment-step-tables 
Add step table metadata during import/export and copy [SCI-7948]
 2023-02-18 08:44:37 +01:00
Giga Chubinidze 14592ebea6 Add office file to task step - reload file option shows plain html page [SCI-7673] 2023-02-17 22:51:10 +04:00
Martin Artnik 3961d1d6af Add delete confirmation modal to checklist items [SCI-7952] 2023-02-17 15:59:37 +01:00
artoscinote 5d276c803c
Merge pull request #4989 from artoscinote/ma_SCI_7934 
Fix MarvinJS image toolbar [SCI-7934]
 2023-02-17 15:53:27 +01:00
sboursen-scinote 063b125778 Fix hound issues [SCI-7815] 2023-02-17 15:47:37 +01:00
Martin Artnik fbf7e69100 Fix MarvinJS image toolbar [SCI-7934] 2023-02-17 15:43:57 +01:00
sboursen-scinote 9dbced7b39 Fix select-all behavior for task table [SCI-7815] 2023-02-17 15:39:24 +01:00
artoscinote e5139b4bd2
Merge pull request #4986 from artoscinote/ma_SCI_7940 
Improve file extension detection for pasted images [SCI-7940]
 2023-02-17 14:59:34 +01:00
artoscinote ac1bf591e2
Merge pull request #4985 from artoscinote/ma_SCI_7946 
Fix RTE image alignments [SCI-7946]
 2023-02-17 14:59:19 +01:00
artoscinote 6400745b0c
Merge pull request #4984 from artoscinote/ma_SCI_7937 
Fix table of contents, add image download tooltip [SCI-7937]
 2023-02-17 14:59:01 +01:00
Anton df8579d52f Add step table metadata during import/export and copy [SCI-7948] 2023-02-17 14:50:45 +01:00
sboursen-scinote 2df05776c2 Update select-all on action-bottons [SCI-7815] 2023-02-17 12:50:26 +01:00
sboursen-scinote ed9aab8ee9 Fix select-all behavior for experiment table [SCI-7815] 2023-02-17 12:39:04 +01:00
Martin Artnik cfdcffc85a Improve file extension detection for pasted images [SCI-7940] 2023-02-17 12:14:08 +01:00
Martin Artnik fdf03b5c46 Fix RTE image alignments [SCI-7964] 2023-02-17 11:29:43 +01:00
Martin Artnik 43f6a8e66f Fix table of contents, add image download tooltip [SCI-7937] 2023-02-17 10:36:47 +01:00
sboursen-scinote b5c8879e57 Fix the behavior of the select-all checkbox in projects table [SCI-7815] 2023-02-17 09:18:32 +01:00
sboursen-scinote 9dd5c4d024 Add a small refactor [SCI-7815] 2023-02-16 23:18:35 +01:00
sboursen-scinote 0f606352fb Refactor reports_datatable and fix the select-all-checkbox functionality [SCI-7815] 2023-02-16 23:17:32 +01:00
sboursen-scinote 9852c4507e Fix typo [SCI-7815] 2023-02-16 20:21:46 +01:00
sboursen-scinote b0d8d80b1d Fix the behavior of the select-all checkbox in protocol template datatables [SCI-7815] 2023-02-16 20:04:34 +01:00
ajugo 9a57071d7a
Update restore action for protocol templates [SCI-7634] (#4969) 
* Update restore action for protocol templetes [SCI-7634]

* Move protocol table reload to methond [SCI-7634]
 2023-02-16 18:03:11 +01:00
Alex Kriuchykhin ed76fac640
Speed up loading of current tasks widget [SCI-7885] (#4982) 2023-02-16 13:57:17 +01:00
Anton a4e622b903 Update export action in protocol repository [SCI-7901] 2023-02-16 11:39:54 +01:00
ajugo 46a1c1b7d3
Add jquery to sing_in_halt layout [SCI-7932] (#4979) 2023-02-15 15:59:37 +01:00
aignatov-bio 2f25e7ef7c
Merge pull request #4976 from aignatov-bio/ai-sci-7922-fix-name-editing 
Fix tab button on name edit fields [SCI-7922]
 2023-02-15 13:49:15 +01:00
artoscinote e58f0fc1f2
Merge pull request #4912 from G-Chubinidze/gc_SCI_7195 
Text block on step without title in rearrange modal [SCI-7195]
 2023-02-15 10:43:44 +01:00
sboursen-scinote 0039edae66 Update the style of the revert protocol modal [SCI-7910] 2023-02-15 09:26:46 +01:00
Anton 568ab0ff66 Fix tab button on name edit fields [SCI-7922] 2023-02-14 18:24:50 +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
sboursen-scinote 043cb6f5fb Fix hound issues [SCI-7909] 2023-02-14 16:43:57 +01:00
ajugo aa3ea584a9
Fix visibility of archived by and on column in repository [SCI-7674][7924] (#4973) 2023-02-14 16:27:17 +01:00
sboursen-scinote 0f9dcda99b Update the style of the unlink protocol modal [SCI-7909] 2023-02-14 16:26:06 +01:00
sboursen-scinote 4b264db343 Update the text of the inlink protocol modal [SCI-7909] 2023-02-14 14:59:05 +01:00
aignatov-bio 20339a6723
Merge pull request #4971 from aignatov-bio/ai-sci-7836-fix-infinite-scroll 
Fix infinite scroll [SCI-7836]
 2023-02-14 14:32:49 +01:00
Martin Artnik ac9c569b39 Enable Lato font in TinyMCE iframe [SCI-7883] 2023-02-14 14:06:47 +01:00
ajugo cb332f163f
Update the Load protocol template to task modal [SCI-7591] (#4870) 
* Update the Load protocol template to task modal [SCI-7591]

* Update the Load protocol template to task modal [SCI-7591]

* Load last protocol version from repository to task [SCI-7591]

* Fix find_by for load_table [SCI-7591]
 2023-02-14 13:19:24 +01:00
Anton 7f58440b0e Fix infinite scroll [SCI-7836] 2023-02-14 12:29:43 +01:00
ajugo 7e48ce70c9
Add handson table metadata to print protocol [SCI-7914] (#4957) 2023-02-14 11:15:42 +01:00
Anton ea9d2d8291 Merge branch 'develop' into features/protocol_versioning 2023-02-14 11:07:58 +01:00
artoscinote 5eb7fa8363
Merge pull request #4962 from sboursen-scinote/sb_SCI-7685 
Update pdf/docx reports - font size [SCI-7685]
 2023-02-14 10:27:34 +01:00
artoscinote d3a1da6244
Merge pull request #4965 from artoscinote/ma_SCI_7916 
Add image TinyMCE plugin [SCI-7916]
 2023-02-14 10:26:31 +01:00
Alex Kriuchykhin b71f360261
Add visibility and default public user role fields to protocols [SCI-7819] (#4963) 2023-02-13 16:18:26 +01:00
Martin Artnik 8d434c7be4 Fix base64 image extraction for non-saved models [SCI-7918] 2023-02-13 16:03:58 +01:00
Martin Artnik 5e63240996 Add image TinyMCE plugin [SCI-7916] 2023-02-13 15:33:56 +01:00
Anton dc5cfb9fc3 Add publish and delete action [SCI-7905] 2023-02-13 14:45:22 +01:00
Martin Artnik f880ea46ce Add connected device logging [SCI-7632] 2023-02-13 11:32:18 +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
Anton 743d901310 Add published view for protocol [SCI-7617] 2023-02-13 10:41:30 +01:00
Anton 3902310463 Update protocol view screen [SCI-7590] 2023-02-13 09:52:30 +01:00
sboursen-scinote 677827d8a3 Center Datatable no item text [SCI-7772] 2023-02-10 17:03:21 +01:00
sboursen-scinote 78f534b5ea Fix the width of the checkbox column in inventory table [SCI-7772] 2023-02-10 14:56:54 +01:00
sboursen-scinote a6eb682234 Fix the spacing for PET tables [SCI-7772] 2023-02-10 14:27:25 +01:00
artoscinote 8313572df4
Merge pull request #4953 from sboursen-scinote/sb_SCI-7625 
Assign users to task - dropdown not refreshed after removing user  [SCI-7625]
 2023-02-09 16:44:47 +01:00
sboursen-scinote e8cae5cc86 Fix hound issues [SCI-7904] 2023-02-09 16:17:20 +01:00
sboursen-scinote 1397b2b2e6 Change the style of the header and footer borders [SCI-7904] 2023-02-09 16:09:44 +01:00
sboursen-scinote 622b7f3341 Change the width of modal [SCI-7904] 2023-02-09 15:50:25 +01:00
Anton b55f68c0dc Update archive action for protocol templates [SCI-7898] 2023-02-09 14:10:07 +01:00
sboursen-scinote b0505adc4d Fix hound issues [SCI-7625] 2023-02-09 12:37:35 +01:00
sboursen-scinote dc333f77d5 Update the Selector when a user is selected/deselected [SCI-7625] 2023-02-09 12:30:51 +01:00
aignatov-bio 23e50cf710
Merge pull request #4882 from aignatov-bio/ai-sci-7608-update-archive-view-for-protoco-templates 
Add archive view for protocols template [SCI-7608]
 2023-02-09 11:40:47 +01:00
Anton 1a0b28c74e Add archive view for protocols template 2023-02-09 11:38:27 +01:00
aignatov-bio 15d1efa408
Merge pull request #4894 from okriuchykhin/ok_SCI_7718 
Add permission for protocol draft management [SCI-7718]
 2023-02-09 11:34:22 +01:00
sboursen-scinote 4083f0a065 Use YAGNI on the file [SCI-7685] 2023-02-08 11:53:04 +01:00
sboursen-scinote da1d8231cc Convert font-size unit to pt [SCI-7685] 2023-02-08 11:50:19 +01:00
artoscinote 6e44c8895d
Merge pull request #4948 from artoscinote/ma_SCI_7187 
Add targetable class to tinyMCE packs [SCI-7187]
 2023-02-07 15:51:55 +01:00
Martin Artnik eceeb7ceb5 Add targetable class to tinyMCE packs [SCI-7187] 2023-02-07 15:47:44 +01:00
sboursen-scinote befb2edfcf Strip trailling carriage and newlines in TinyMCE text [SCI-7237] 2023-02-07 15:44:53 +01:00
sboursen-scinote dbb547b3ee Reduce print margin for step [SCI-7237] 2023-02-07 15:43:44 +01:00
ajugo 5dd9a7adaf
Fixed protocols.io import for multiple-step cases. [SCI-7843] (#4946) 
* Fix attachments for protocols.io importer [SCI-7843]

* Fix protocols io import for multiple step cases [SCI-7843]
 2023-02-07 15:34:04 +01:00
Anton a679e0ea62 Add inherit information to access modal [SCI-7882] 2023-02-07 15:19:20 +01:00
artoscinote 77b4a557f1
Merge pull request #4881 from artoscinote/ma_SCI_7631 
Throw error when authenticating with revoked tokens [SCI-7631]
 2023-02-07 13:39:03 +01:00
aignatov-bio 193ff7bc46
Merge pull request #4891 from aignatov-bio/ai-sci-7520-implement-version-modals-interactions 
Add manage actions to version modal [SCI-7520]
 2023-02-07 13:38:33 +01:00
Anton 94f8d139a1 Fix experiments sidebar sorting [SCI-7894] 2023-02-07 13:35:00 +01:00
aignatov-bio 6e570dcc9d
Merge pull request #4915 from aignatov-bio/ai-sci-7840-fix-headers-in-tinymce 
Fix heading styles for tinymce [SCI-7840]
 2023-02-07 13:25:02 +01:00
artoscinote ca183f1f76
Merge pull request #4944 from G-Chubinidze/gc_SCI_7883 
fixed tinymce stylings for all elements inside editing mode [SCI-7883]
 2023-02-07 13:11:03 +01:00
artoscinote 1a8cacaeb8
Merge pull request #4942 from artoscinote/ma_SCI_7886 
Disable all TinyMCE context menus [SCI-7886]
 2023-02-07 13:10:12 +01:00
Giga Chubinidze 3483c7ba56 fixed tinymce stylings for all elements inside editing mode 2023-02-07 16:00:14 +04:00
Giga Chubinidze 9e3073b11e step timestamp changes 2023-02-07 15:53:58 +04:00
Martin Artnik d0fd0efc1f Disable all TinyMCE context menus [SCI-7886] 2023-02-07 11:40:18 +01:00
artoscinote 88cc8e3df4
Amend token revocation check method name [SCI-7631] 2023-02-07 11:05:48 +01:00
ajugo 9caa5be4c0
Updated protocol actions select menu in task [SCI-7820] (#4939) 2023-02-07 10:39:49 +01:00
ajugo c2fcba729a
Add empty space in PDF report after asset link [SCI-7660] (#4940) 2023-02-07 10:39:11 +01:00
artoscinote 5a93cd1a12
Merge pull request #4921 from artoscinote/ma_SCI_7187 
Support compiling webpacker content from addons [SCI-7187]
 2023-02-07 10:24:18 +01:00
artoscinote b9be286802
Merge pull request #4908 from sboursen-scinote/sb_SCI-7674 
Inventories: archived by and archived on seen on active item list [SCI-7674]
 2023-02-07 10:23:28 +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
ajugo 29a7113cc1
Fix loading task steps and step timestamps [SCI-7902] (#4941) 2023-02-06 16:47:11 +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
Martin Artnik ebd98bfb85 Make TinyMce init more extensible [SCI-7187] 2023-02-06 16:05:13 +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
ajugo d66dc98300
Update print protocol modal [SCI-7830] (#4932) 2023-02-06 14:23:56 +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
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
artoscinote 3331c5fa3f
Merge pull request #4928 from G-Chubinidze/gc_SCI_7837 
Step timestamp display [SCI-7837]
 2023-02-06 12:03:02 +01:00
ajugo 442fd5e971
Fix protocol printing dialog [SCI-7889] (#4933) 2023-02-06 11:34:59 +01:00
sboursen-scinote a78f113498 Update the style of the form-group with errors [SCI-7831] 2023-02-06 11:31:25 +01:00
artoscinote 41644d70ea
Merge pull request #4934 from G-Chubinidze/gc_SCI_7883 
Update the TinyMCE font [SC-7883]
 2023-02-06 11:19:29 +01:00
artoscinote d8c5bcedd1
Merge pull request #4926 from okriuchykhin/ok_SCI_7761 
Allow user management on archived projects [SCI-7761]
 2023-02-06 11:18:39 +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 914cd3c2c8
Fix the eye icon on disable 2fa modal [SCI-7528] (#4906) 2023-02-06 11:17:57 +01:00
artoscinote 6d455d6b7b
Merge pull request #4889 from sboursen-scinote/sb_SCI-7585 
FIX: Clear/Close filter change - Inventory/Items filter [SCI-7585]
 2023-02-06 11:17:43 +01:00
artoscinote 4405fa2cd9
Merge pull request #4913 from sboursen-scinote/sb_SCI-7814 
FIX: Tag modal opens in experiment table view [SCI-7814]
 2023-02-06 11:14:13 +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
sboursen-scinote 43680f1295 Remove the key prefix (e.g. Name:) from the form-control error message [SCI-7831] 2023-02-06 11:12:32 +01:00
Giga Chubinidze b06b5c4d1f Check what's up with user_my_modules_controller#index_old action, and remove/rename it [SCI-7848] 2023-02-05 23:27:22 +04:00
Giga Chubinidze f3a4f316bb Update the TinyMCE font [SC-7883] 2023-02-05 23:02:59 +04:00
Giga Chubinidze 9595f434d0 on/at convention fix 2023-02-05 23:00:20 +04:00
Alex Kriuchykhin 958f9784b0
Add minimum length validation to label template name [SCI-7319] (#4930) 2023-02-03 15:36:32 +01:00
Giga Chubinidze ac4b090560 slight style refactor 2023-02-03 13:38:03 +04:00
sboursen-scinote ada165264a Bring the information flyout to the foreground in task panel [SCI-7832] 2023-02-03 08:25:07 +01:00
Giga Chubinidze ed4363484a Step timestamp display [SCI-7837] 2023-02-03 11:12:33 +04:00
Martin Artnik ae7fce446b Don't touch steps when commenting [SCI-7584] 2023-02-02 16:28:23 +01:00
Oleksii Kriuchykhin 53fca4f022 Allow user managment on archived projects [SCI-7761] 2023-02-02 15:09:45 +01:00
Alex Kriuchykhin 15ac306244
Fix user auto linking with Azure AD [SCI-7764] (#4924) 2023-02-02 13:27:49 +01:00
Oleksii Kriuchykhin 8eafe0fd4a Fix Azure and Okta sign in links [SCI-7764] 2023-02-02 11:20:02 +01:00
Soufiane 937c8564f0
Update Invite new user to team modal [SCI-6007] (#4854) 
Update Invite new user to team modal [SCI-6007]
 2023-02-01 16:27:50 +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