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

12647 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
artoscinote 397e4aeebe
Merge pull request #4935 from G-Chubinidze/gc_SCI_7848 
user_my_modules_controller#index_old action updates [SCI-7848]
 2023-03-21 11:41:38 +01:00
Giga Chubinidze 8e942379ff changed assignee to designated_users 2023-03-21 14:29:23 +04:00
Giga Chubinidze 9dcd2f1500 Cursor position improvements, focused fields - part 2 [SCI-8147] 2023-03-21 13:17:44 +04:00
Giga Chubinidze b7490ebcca Cursor position improvements, focused fields - part 1 [SCI-8098 2023-03-21 11:14:44 +04:00
Oleksii Kriuchykhin 7fff3e8f78 Merge branch 'hotfix/1.26.6.2' into develop 2023-03-20 15:36:49 +01:00
Oleksii Kriuchykhin 33d63a58fa Bump version to 1.26.6.2 2023-03-20 14:58:24 +01:00
Alex Kriuchykhin ad358e3939
Merge pull request #5168 from rekonder/aj_SCI_8165 
Fix docx table generator if metadata is unknown [SCI-8165]
 2023-03-20 14:19:21 +01:00
Andrej 8bf9e2425b Fix docx table generator if metadata are nil [SCI-8165] 2023-03-20 14:12:44 +01:00
Alex Kriuchykhin 0bfd7ee9c2
Merge pull request #5165 from aignatov-bio/ai-sci-8160-fix-version-revision 
Fix permission for draft revision comment [SCI-8160]
 2023-03-20 14:03:50 +01:00
Alex Kriuchykhin d30a6407ba
Merge pull request #5166 from rekonder/aj_SCI_8165 
* Fix docx report generation with broken metadate [SCI-8165]
 2023-03-20 12:37:41 +01:00
Andrej 64441f791f Fix check for nil row [SCI-8165] 2023-03-20 11:59:20 +01:00
Anton a684ff2656 CSS fixes for version modal [SCI-8155] 2023-03-20 11:46:01 +01:00
Andrej 8d7d2a4539 Merge branch 'hotfix/1.26.6.2' of https://github.com/biosistemika/scinote-web into aj_SCI_8165 2023-03-20 11:16:33 +01:00
Andrej c84adfdecc Fix docx report generation with broken metadate [SCI-8165] 2023-03-20 11:14:27 +01:00
Alex Kriuchykhin 9d26536037
Merge pull request #5164 from scinote-eln/features/protocol_versioning 
Merge features/protocol_versioning to develop
 2023-03-17 15:02:54 +01:00
Anton 12f1456e4f Fix permission for draft revision comment [SCI-8160] 2023-03-17 14:40:19 +01:00
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
sboursen-scinote 0526bfaae1 Fix the result asset cancel behavior when clicking enter [SCI-7670] 2023-03-16 14:19:24 +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