Commit graph

12573 commits

Author SHA1 Message Date
Oleksii Kriuchykhin b67691acb5 Merge branch 'develop' into features/protocol_versioning 2023-03-17 13:53:30 +01:00
G-Chubinidze 06eeb3b27f
FE manage devices (table view) + revoking the device [SCI-7633] (#4920)
* FE manage devices (table view) + revoking the device [SCI-7633]

* revocation code optimisation

* hound fixes

---------

Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
2023-03-17 13:44:41 +01:00
ajugo cedbd8de20
Fix access modal view for users without manage permissions [SCI-8139] (#5148) 2023-03-17 11:30:51 +01:00
aignatov-bio 5844fce23e
Merge pull request #5156 from aignatov-bio/ai-sci-8154-cleanup-old-protocol-code
Clean old protocol code [SCI-8154]
2023-03-17 11:26:41 +01:00
Alex Kriuchykhin 05c4a1c4f0
Add missing sanitization helper to projects access controller [SCI-8158] (#5162) 2023-03-17 11:25:36 +01:00
Anton 248b6b6581 Remove additional code 2023-03-17 11:11:59 +01:00
Alex Kriuchykhin 4dd5cb5de4
Adapt global search for new protocol versioning [SCI-8080] (#5158) 2023-03-17 10:43:50 +01:00
Soufiane 0ffcc5e49c
Merge pull request #5152 from sboursen-scinote/sb_SCI-8108
CSS: Protocol template - Details (update) [SCI-8108]
2023-03-17 10:12:40 +01:00
Alex Kriuchykhin 4231a141ce
Bump rack from 2.2.6.3 to 2.2.6.4 (#5161) 2023-03-17 09:51:17 +01:00
Alex Kriuchykhin bd670bb177
Allow data attributes in html sanitization [SCI-8158] (#5159) 2023-03-16 18:17:18 +01:00
Anton da36b7268f Clean old protocol code [SCI-8154] 2023-03-16 14:37:19 +01:00
aignatov-bio b5100269cc
Merge pull request #5153 from aignatov-bio/ai-sci-8138-fix-step-resutl-tables-save-bug
Fix handson table metadata issue [SCI-8138]
2023-03-16 14:07:50 +01:00
Anton 5a242021e3 Fix handson table metadata issue [SCI-8138] 2023-03-16 12:02:20 +01:00
Soufiane bc900cd26d
Merge branch 'features/protocol_versioning' into sb_SCI-8108 2023-03-16 09:20:36 +01:00
sboursen-scinote d49a992dd4 Fix styles when protocol is published [SCI-8108] 2023-03-16 09:15:22 +01:00
Alex Kriuchykhin f94c9e0b36
Avoid double escaping in user's name on protocol and step elements [SCI-8137] (#5150) 2023-03-15 16:36:06 +01:00
aignatov-bio fedd9e040e
Fix escaping for protocol keyword [SCI-8137] (#5147) 2023-03-15 16:04:33 +01:00
Alex Kriuchykhin 483a7aad5b
Improve special character escaping in data attributes [SCI-8137] (#5149) 2023-03-15 16:01:01 +01:00
Alex Kriuchykhin b0251435e5
Improve escaping of special characters in flash messages [SCI-8137] (#5144) 2023-03-15 15:56:47 +01:00
ajugo 7c287b3993
Reword project access permissions [SCI-8124] (#5146) 2023-03-15 13:53:43 +01:00
Soufiane 5cc06aedf5
Old buttons at importing protocols.io protocol (update) [SCI-8032] (#5137)
* Fix Small css inacuracies [SCI-8032]

* Remove the technician role [SCI-8032]

* Use permissions to filter the authorised roles [SCI-8032]
2023-03-15 13:28:45 +01:00
aignatov-bio 44823da268
Fix escaping for dropdown options and keywords escaping [SCI-8137] (#5145) 2023-03-15 12:55:28 +01:00
G-Chubinidze 6ba6d98989
Merge pull request #5143 from G-Chubinidze/gc_SCI_8100
increased active pagination size [SCI-8100]
2023-03-15 14:17:35 +04:00
Giga Chubinidze 57721a01e4 increased active pagination size 2023-03-15 14:15:36 +04:00
Alex Kriuchykhin 00c63b280e
Fix displaying of escaped fields [SCI-8137] (#5141) 2023-03-15 11:14:52 +01:00
G-Chubinidze b68f5ced7a
Protocol permission bugs [SCI-8058] (#5142)
* Protocol permission bugs [SCI-8058]

---------

Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
2023-03-15 11:14:20 +01:00
Soufiane bab32b04b6
Merge pull request #5105 from sboursen-scinote/sb_SCI-8007
Bugs for "Protocol templates" [SCI-8007]
2023-03-15 09:25:59 +01:00
sboursen-scinote c6bb9850ea Merge feature/protocol_versioning into sb_SCI-8007 [SCI-8007] 2023-03-15 09:24:45 +01:00
sboursen-scinote dcbe1615cf Refactor the records generation method [8007]
Co-Authored-By: okriuchykhin <oleksii@scinote.net>
2023-03-15 09:14:01 +01:00
aignatov-bio 336cf4d855
Fix PET permission propagation [SCI-8132] (#5139) 2023-03-14 18:48:06 +01:00
ajugo 0fe3f5f38f
Fix missing tooltip and hover effect for access modal role selection [SCI-8122] (#5140) 2023-03-14 18:41:32 +01:00
ajugo 3c18e42d5e
Fix css for access modal [SCI-8127] (#5138) 2023-03-14 15:24:22 +01:00
aignatov-bio 9a3b056d32
Fix access modal for protocol [SCI-8063] (#5128) 2023-03-14 14:49:11 +01:00
ajugo 917269a8e9
Add micro-interactions for protocol repository modals [SCI-8091] (#5102) 2023-03-14 14:20:03 +01:00
G-Chubinidze 47f9fd5c76
Merge pull request #5136 from G-Chubinidze/gc_SCI_8058
Protocol permissions - button display [SCI-8058]
2023-03-14 17:08:00 +04:00
G-Chubinidze 7881ffbd3d
Merge branch 'features/protocol_versioning' into gc_SCI_8058 2023-03-14 17:07:52 +04:00
aignatov-bio 821a9191e5
Merge pull request #5120 from G-Chubinidze/gc_SCI_8086
Archived experiments UI improvements [SCI-8086]
2023-03-14 13:07:49 +01:00
ajugo 8acbf0b4f1
Fix revert protocol action for linked task changes [SCI-8110] (#5125) 2023-03-14 13:03:37 +01:00
Soufiane 7b93ced541
CSS: Protocol template - Details [SCI-8108] (#5131)
* Fix spacing issue in protocol details [SCI-8108]

* Fix spacing issue in protocol datatable [SCI-8108]

* Match the styles of the authors and the keywords to figma [SCI-8108]

* Fix broken dropdown footer [SCI-8108]

* Fix hound [SCI-8108]
2023-03-14 12:54:13 +01:00
Soufiane 1d396e57ab
Update of a Task Filters on a dashboard (Clear/Close function, Show results) [SCI-7607] (#4873)
* Change the position of the clear button and update the Apply button text [SCI-7607]

* Add a clos button in the header of the dropdown [SCI-7607]

* Fix scss style issue [SCI-7607]

* Change gap to margin-right [SCI-7607]
2023-03-14 12:53:27 +01:00
Giga Chubinidze d5e0c041a8 changed disabled_drafting logic 2023-03-14 14:41:00 +04:00
G-Chubinidze ef596a5579
Merge pull request #5076 from G-Chubinidze/gc_SCI_8008
Incorrect bottom action bar states for Protocol templates [SCI-8008]
2023-03-14 14:17:29 +04:00
G-Chubinidze 38a07b6dc7
Merge pull request #5132 from G-Chubinidze/gc_SCI_7630
Protocol templates table - linked tasks modal [SCI-7630]
2023-03-14 13:59:53 +04:00
aignatov-bio e6c204a246
Fix save as new protocol modal [SCI-8003] (#5129) 2023-03-14 10:22:09 +01:00
Giga Chubinidze 67539b15de Protocol permissions - button display [SCI-8058] 2023-03-14 12:12:54 +04:00
Alex Kriuchykhin d82470aa03
Improve handling and escaping of special characters in input fields [SCI-8125] (#5135) 2023-03-13 18:00:30 +01:00
aignatov-bio 40f223deca
Fix XSS for tasks table titles [SCI-8133] (#5134) 2023-03-13 15:19:59 +01:00
Giga Chubinidze 0ffe9b619c Protocol templates table - linked tasks modal [SCI-7630] 2023-03-13 18:19:28 +04:00
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