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

12494 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aignatov-bio 0044726425
Merge branch 'develop' into ai-sci-8155-css-fixes-for-version-modal 2023-03-22 11:32:49 +01:00
artoscinote 4750d61b77
Merge pull request #5177 from scinote-eln/revert-5029-gc_SCI_7763 
Revert "Search by team does not work [SCI-7763]"
 2023-03-22 10:24:32 +01:00
artoscinote 13413a296b
Merge pull request #5176 from scinote-eln/revert-5120-gc_SCI_8086 
Revert "Archived experiments UI improvements [SCI-8086]"
 2023-03-22 10:24:16 +01:00
G-Chubinidze 44cc9d1c90
Revert "Search by team does not work [SCI-7763]" 2023-03-22 13:22:05 +04:00
G-Chubinidze a1c611ab1e
Revert "Archived experiments UI improvements [SCI-8086]" 2023-03-22 13:21:08 +04:00
Alex Kriuchykhin b3889de17b
Merge pull request #5171 from okriuchykhin/ok_SCI_8145 
Fix visibility of save as draft button, fix permissions for new drafts [SCI-8145][SCI-8157]
 2023-03-21 16:40:22 +01:00
Oleksii Kriuchykhin cf599a8277 Fix visibility of save as draft button, fix permissions for new drafts [SCI-8145][SCI-8157] 2023-03-21 16:25:02 +01:00
artoscinote fb427f7d55
Merge pull request #5173 from scinote-eln/revert-5169-gc_SCI_8098 
Revert "Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]"
 2023-03-21 15:26:20 +01:00
artoscinote 44098ece5d
Revert "Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]" 2023-03-21 15:26:06 +01:00
artoscinote b089453ec7
Merge pull request #5172 from scinote-eln/revert-5170-gc_SCI_8147 
Revert "Cursor position improvements, focused fields - part 2 (more i…
 2023-03-21 15:25:47 +01:00
artoscinote e2dc2e31ee
Revert "Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]" 2023-03-21 15:24:40 +01:00
artoscinote a43c941b50
Merge pull request #5170 from G-Chubinidze/gc_SCI_8147 
Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]
 2023-03-21 15:18:37 +01:00
artoscinote 634b4145fd
Merge pull request #5169 from G-Chubinidze/gc_SCI_8098 
Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]
 2023-03-21 15:17:55 +01:00
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
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