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

3901 commits

Author SHA1 Message Date
artoscinote 8a7667432c
Merge pull request #5234 from G-Chubinidze/gc_SCI_8211 
Label '(Draft)' in front of the protocol template name [SCI-8211]
 2023-04-11 10:14:17 +02:00
Giga Chubinidze 1d44eea8cf updated device table stylings 2023-04-10 23:57:43 +04:00
artoscinote f6902ea0ef
Merge pull request #5265 from aignatov-bio/ai-sci-8272-fix-archived-results 
Fix results archived page [SCI-8272]
 2023-04-07 09:56:39 +02:00
aignatov-bio 58c84634a6
Merge pull request #5238 from sboursen-scinote/sb_SCI-8087 
Improve breadcrumbs implementation [SCI-8087]
 2023-04-06 19:52:33 +02:00
sboursen-scinote 287b63f2c5 Remove uneeded data and classes [SCI-8087] 2023-04-06 17:20:49 +02:00
Anton 46b3791125 Fix results archived page [SCI-8272] 2023-04-06 17:16:43 +02:00
Oleksii Kriuchykhin 60579465ab Refactor user_notifications controller, remove unused code [SCI-8207] 2023-04-06 14:57:00 +02:00
sboursen-scinote 7a3d5e03f4 Refactore after review [SCI-8087] 2023-04-06 12:23:33 +02:00
sboursen-scinote 55be84cda7 Remove missed old breadcrumbs [SCI-8087] 2023-04-05 16:29:37 +02:00
artoscinote bd02b71efe
Merge pull request #5157 from sboursen-scinote/sb_SCI-7670 
Pressing Enter button cancels adding of a image on task result [SCI-7670]
 2023-04-05 15:27:22 +02:00
artoscinote 0f8c73771a
Merge pull request #5001 from sboursen-scinote/sb_SCI-7783 
CSS - inventory [SCI-7783]
 2023-04-05 15:24:18 +02:00
Anton 52aac69488 Add final version for left menu [SCI-8016] 2023-04-03 13:29:24 +02:00
Alex Kriuchykhin bed256cd37
Merge pull request #5231 from artoscinote/ma_SCI_8131 
Handle removal of last owner public group [SCI-8131]
 2023-04-03 13:02:38 +02:00
Martin Artnik 132593c854 Prevent removal of last manually assigned user manager [SCI-8131] 2023-04-03 11:46:32 +02:00
sboursen-scinote d40fa5972c Remove old implementation in projects and experiments [SCI-8087] 2023-04-02 19:11:25 +02:00
sboursen-scinote 6d34ea41d2 Style the new breadcrumbs [SCI-8087] 2023-04-02 18:42:21 +02:00
sboursen-scinote 8ae354b180 Merge branch 'features/navigation-refactor' into sb_SCI-8087 2023-04-02 17:33:23 +02:00
Anton 0c76d7a9b1 Merge branch 'develop' into features/navigation-refactor 2023-03-31 20:31:30 +02:00
Giga Chubinidze 3fc2afde3c Label '(Draft)' in front of the protocol template name [SCI-8211] 2023-03-31 18:30:26 +04:00
ajugo f535bc1fa0
Fix protocol counter on my statistics [SCI-8240] (#5228) 2023-03-31 10:01:58 +02:00
sboursen-scinote 501279372c Style the breadcrumbs [SCI-8087] 2023-03-30 21:56:38 +02:00
sboursen-scinote 31b979cde9 Add prefix for archived elements [SCI-8087] 2023-03-30 21:22:33 +02:00
sboursen-scinote 6cf3782339 Implement layout breadcrumbs for Projects and project folders [SCI-8087] 2023-03-30 16:29:21 +02:00
Anton ed1c4bcb69 Replace webpacker with jsbundling-rails [SCI-7926] 2023-03-30 13:39:57 +02:00
Martin Artnik d86a93919b Handle deleted protocol activities [SCI-8228] 2023-03-29 16:20:53 +02:00
Oleksii Kriuchykhin 89a45d2b14 Merge branch 'hotfix/1.26.6.4' into develop 2023-03-29 10:39:51 +02:00
artoscinote be4f008f09
Merge pull request #5224 from sboursen-scinote/sb_SCI-7607-fix2 
Fix clear button style in dashboard filter [SCI-7607]
 2023-03-29 10:37:10 +02:00
sboursen-scinote 226a89e8bf Fix clear button style in dashboard filter [SCI-7607] 2023-03-29 10:34:13 +02:00
artoscinote 3173b9f96e
Merge pull request #5216 from artoscinote/ma_SCI_8202 
Fix print for linked protocols [SCI-8202]
 2023-03-29 09:58:49 +02:00
Martin Artnik 6412a65d7e Fix new protocol default role, fix reload of protocol access modal [SCI-8217] 2023-03-28 16:22:38 +02:00
Anton 4a5e0de54f Fix css for task protocol [SCI-8214] 2023-03-28 14:53:47 +02:00
Martin Artnik e819c730e7 Fix print for linked protocols [SCI-8202] 2023-03-28 12:08:55 +02:00
Martin Artnik f48350c6ea Properly handle repository snapshots in reports [SCI-8212] 2023-03-28 10:37:24 +02:00
ajugo 26879f200d
Fix CSS for protocol versioning modal [SCI-8194] (#5197) 2023-03-27 13:28:00 +02:00
Martin Artnik cb21b9f29b Fix search for new access grant [SCI-8196] 2023-03-27 12:46:14 +02:00
Alex Kriuchykhin f99326507d
Merge pull request #5202 from aignatov-bio/ai-sci-8195-fix-error-in-protocol-global-search 
Fix link in protocol global search [SCI-8195]
 2023-03-27 11:47:04 +02:00
sboursen-scinote e4d5732967 Add border to cancel button [SCI-7607] 2023-03-27 11:14:54 +02:00
Anton 2883b17467 Fix link in protocol global search [SCI-8195] 2023-03-27 10:50:09 +02:00
Alex Kriuchykhin e7bd133895
Merge pull request #5191 from aignatov-bio/ai-sci-8160-update-front-end-permission-for-version-comment 
Update front end permission check for version comment [SCI-8160]
 2023-03-24 13:14:03 +01:00
Anton 9818e41353 Update front end permission check for version comment [SCI-8160] 2023-03-24 13:11:14 +01:00
aignatov-bio 09a217baca
Merge pull request #5193 from aignatov-bio/ai-sci-8190-fix-protocol-screen-css 
Protocol screen css fixes [SCI-8190]
 2023-03-24 13:04:00 +01:00
Anton 0b560f5b05 Protocol screen css fixes [SCI-8190] 2023-03-24 12:01:47 +01:00
artoscinote 00191e41de
Merge pull request #5192 from scinote-eln/features/token-revocation 
Features/token revocation
 2023-03-24 11:13:38 +01:00
Oleksii Kriuchykhin 7ef2f68078 Merge branch 'hotfix/1.26.6.3' into develop 2023-03-23 13:26:12 +01:00
ajugo 4c42748e40
Add protocolsIO import preview [SCI-8187] (#5183) 2023-03-23 12:18:30 +01:00
Anton 854fc1764b Refactor left/top navigation [SCI-8055] 2023-03-22 14:08:21 +01:00
Oleksii Kriuchykhin 3443a6fb85 Fix create step comments permissions [SCI-8174] 2023-03-22 12:52:08 +01:00
ajugo fe37699ba5
Add switch for connected devices [SCI-8112] (#5179) 2023-03-22 12:15:01 +01:00
aignatov-bio 0044726425
Merge branch 'develop' into ai-sci-8155-css-fixes-for-version-modal 2023-03-22 11:32:49 +01:00
ajugo 8eb04c50c2
Add removing connected device [SCI-8146] (#5174) 2023-03-21 16:44:24 +01: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 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 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
Oleksii Kriuchykhin 7fff3e8f78 Merge branch 'hotfix/1.26.6.2' into develop 2023-03-20 15:36:49 +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
Anton a684ff2656 CSS fixes for version modal [SCI-8155] 2023-03-20 11:46:01 +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
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
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 33c880149c
Add new general account [SCI-7963] (#5127) 2023-03-16 12:54:24 +01:00
Alex Kriuchykhin 483a7aad5b
Improve special character escaping in data attributes [SCI-8137] (#5149) 2023-03-15 16:01:01 +01:00
sboursen-scinote c6bb9850ea Merge feature/protocol_versioning into sb_SCI-8007 [SCI-8007] 2023-03-15 09:24:45 +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 7881ffbd3d
Merge branch 'features/protocol_versioning' into gc_SCI_8058 2023-03-14 17:07:52 +04: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 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
Giga Chubinidze 0ffe9b619c Protocol templates table - linked tasks modal [SCI-7630] 2023-03-13 18:19:28 +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
Giga Chubinidze b59f922143 CSS: Pixel-perfect issues for Protocol templates [SCI-8100] 2023-03-13 14:25:04 +04: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 e9bdd218fa Sanitize te user_names_with_roles [SCI-8007] 2023-03-10 09:46:45 +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
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
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
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
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 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
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 b8c5323fdc
Merge pull request #5094 from artoscinote/ma_SCI_8038 
PET access modal fixes [SCI-8038]
 2023-03-08 10:49:30 +01:00
Martin Artnik 6cc78790b0 Fix title for archived protocols table [SCI-8092] 2023-03-07 14:55:11 +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
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
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
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
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
Martin Artnik 2f29477e02 Protocol/general user assignment changes and fixes [SCI-8039] 2023-03-06 16:43:46 +01:00
sboursen-scinote 34f324f7ca Update the sort component [SCI-8045] 2023-03-06 12:00:53 +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
sboursen-scinote 80b3863efa Render protocol-preview-modal independently on protocolio-modal [SCI-8032] 2023-03-03 09:02:17 +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
ajugo 72cf844c3e
Fix protocol version modification info text [SCI-8061] (#5064) 2023-03-02 15:35:02 +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
Martin Artnik d71c14e2eb Add missing prism.js includes to layout [SCI-7974] 2023-03-01 15:21:01 +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 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
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
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
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
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
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
Giga Chubinidze 59078e923b Show delete button only for drafts [SCI-7997] 2023-02-27 16:00:35 +04: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
Martin Artnik 3686844dac Add missing protocol default user role view [SCI-7978] 2023-02-24 18:28:19 +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 89459ae21a Protocol group assignment fixes [SCI-7978] 2023-02-24 17:24:25 +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
Martin Artnik c24b0fa5ab Refactor access modals [SCI-7978] 2023-02-23 14:57:38 +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
Alex Kriuchykhin e020b4a416
Improve tags sanitization in smart annotations (#5008) 2023-02-21 16:53:04 +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
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
Anton c775a92914 Update protocolsIo front-end [SCI-7715] 2023-02-21 11:06:54 +01: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 029f61e695
Disable gray canvas navigator [SCI-7950] (#4991) 2023-02-20 10:15:08 +01:00
ajugo 2c079cc918
Update protocol duplication [SCI-7900] (#4992) 2023-02-18 09:09:33 +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
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
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
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
Anton dc5cfb9fc3 Add publish and delete action [SCI-7905] 2023-02-13 14:45:22 +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 3902310463 Update protocol view screen [SCI-7590] 2023-02-13 09:52:30 +01:00
Anton b55f68c0dc Update archive action for protocol templates [SCI-7898] 2023-02-09 14:10:07 +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
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
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
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
ajugo c2fcba729a
Add empty space in PDF report after asset link [SCI-7660] (#4940) 2023-02-07 10:39:11 +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
ajugo 442fd5e971
Fix protocol printing dialog [SCI-7889] (#4933) 2023-02-06 11:34:59 +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
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