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
12615 commits 70 branches 179 tags 165 MiB
Commit graph

12615 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 45f1b3c97d Merge remote-tracking branch 'origin/sb_SCI-8007' into sb_SCI-8007 2023-03-10 09:17:53 +01:00
sboursen-scinote 55ebb4817e Fix hound [SCI-8007] 2023-03-10 09:16:50 +01:00
sboursen-scinote 36782611b4 Fix hound [SCI-8007] 2023-03-09 22:13:52 +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
Alex Kriuchykhin 92d7fbb351
Clean and update JS dependencies, update Rack gem [SCI-7953] (#5115) 2023-03-09 14:25:12 +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
dependabot[bot] 4f55bd75f9
Bump rack from 2.2.6.2 to 2.2.6.3 (#5111) 
Bumps [rack](https://github.com/rack/rack) from 2.2.6.2 to 2.2.6.3.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/v2.2.6.2...v2.2.6.3)

---
updated-dependencies:
- dependency-name: rack
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-09 13:43:33 +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
artoscinote 409a003ca8
Merge pull request #5104 from artoscinote/ma_SCI_8106 
Display ID of original protocol in linked protocol info [SCI-8106]
 2023-03-09 09:57:51 +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 a60d2b8106
Merge pull request #5100 from scinote-eln/ma_SCI_8006 
Update QR generator gem [SCI-8006]
 2023-03-08 11:34:16 +01:00
Martin Artnik 1a47d966d0 Update QR generator gem [SCI-8006] 2023-03-08 11:30:45 +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
artoscinote a503aa1a9f
Add create draft activity name [SCI-8093] 2023-03-08 10:25:11 +01:00