scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-24 17:06:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
12266 commits 69 branches 179 tags 165 MiB
Commit graph

9550 commits

Author SHA1 Message Date
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
G-Chubinidze 33bb7294f1
Merge pull request #5028 from G-Chubinidze/gc_SCI_7997 
Show delete button only for drafts [SCI-7997]
 2023-02-27 16:16:27 +04:00
Giga Chubinidze 59078e923b Show delete button only for drafts [SCI-7997] 2023-02-27 16:00:35 +04:00
aignatov-bio 68ba45728e
Merge pull request #5031 from aignatov-bio/ai-sci-8004-propagate-archived-flag-to-all-versions 
Propagate archived/flag to versions [SCI-8004]
 2023-02-27 12:52:11 +01:00
ajugo d26edb08df
Fix access filter and published by column [SCI-7988] (#5030) 2023-02-27 12:08:45 +01:00
Anton 9abc8489a6 Propagate archived/flag to versions [SCI-8004] 2023-02-27 11:12:40 +01: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
ajugo 95d04d11d2
Fix validation for multiple parent protocols for drafts [SCI-7994] (#5020) 
* Fix validation for multiple parent protocols for drafts [SCI-7994]

* Fix validation for drafts [SCI-7994]

* Fix validation for drafts [SCI-7994]
 2023-02-24 17:56:51 +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 7357782144 Protocol validation fix [SCI-7978] 2023-02-24 17:28:36 +01:00
Martin Artnik 89459ae21a Protocol group assignment fixes [SCI-7978] 2023-02-24 17:24:25 +01:00
sboursen-scinote 548cdf9457 Open protocol versions modal when actions-toolbar button is clicked [sb_SCI-7991] 2023-02-24 16:23:23 +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
Anton dd27b13537 Fix protocol name validation [SCI-8003] 2023-02-24 10:15:23 +01:00
aignatov-bio 8906bc25e7
Fix version counting in protocol datatable [SCI-7993] (#5019) 2023-02-23 15:13:57 +01:00
Martin Artnik c24b0fa5ab Refactor access modals [SCI-7978] 2023-02-23 14:57:38 +01:00
Martin Artnik b0fc97a549 Fix assignable for top level assignables [SCI-7978] 2023-02-22 15:37:39 +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
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 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
Anton a4e622b903 Update export action in protocol repository [SCI-7901] 2023-02-16 11:39:54 +01:00
sboursen-scinote 0039edae66 Update the style of the revert protocol modal [SCI-7910] 2023-02-15 09:26:46 +01:00
sboursen-scinote 043cb6f5fb Fix hound issues [SCI-7909] 2023-02-14 16:43:57 +01:00
sboursen-scinote 0f9dcda99b Update the style of the unlink protocol modal [SCI-7909] 2023-02-14 16:26:06 +01:00
sboursen-scinote 4b264db343 Update the text of the inlink protocol modal [SCI-7909] 2023-02-14 14:59:05 +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
Anton ea9d2d8291 Merge branch 'develop' into features/protocol_versioning 2023-02-14 11:07:58 +01:00
artoscinote 5eb7fa8363
Merge pull request #4962 from sboursen-scinote/sb_SCI-7685 
Update pdf/docx reports - font size [SCI-7685]
 2023-02-14 10:27:34 +01:00
artoscinote d3a1da6244
Merge pull request #4965 from artoscinote/ma_SCI_7916 
Add image TinyMCE plugin [SCI-7916]
 2023-02-14 10:26:31 +01:00
Alex Kriuchykhin b71f360261
Add visibility and default public user role fields to protocols [SCI-7819] (#4963) 2023-02-13 16:18:26 +01:00
Martin Artnik 8d434c7be4 Fix base64 image extraction for non-saved models [SCI-7918] 2023-02-13 16:03:58 +01:00
Martin Artnik 5e63240996 Add image TinyMCE plugin [SCI-7916] 2023-02-13 15:33:56 +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 743d901310 Add published view for protocol [SCI-7617] 2023-02-13 10:41:30 +01:00
Anton 3902310463 Update protocol view screen [SCI-7590] 2023-02-13 09:52:30 +01:00
artoscinote 8313572df4
Merge pull request #4953 from sboursen-scinote/sb_SCI-7625 
Assign users to task - dropdown not refreshed after removing user  [SCI-7625]
 2023-02-09 16:44:47 +01:00
sboursen-scinote e8cae5cc86 Fix hound issues [SCI-7904] 2023-02-09 16:17:20 +01:00
sboursen-scinote 1397b2b2e6 Change the style of the header and footer borders [SCI-7904] 2023-02-09 16:09:44 +01:00
sboursen-scinote 622b7f3341 Change the width of modal [SCI-7904] 2023-02-09 15:50:25 +01:00
Anton b55f68c0dc Update archive action for protocol templates [SCI-7898] 2023-02-09 14:10:07 +01:00
sboursen-scinote b0505adc4d Fix hound issues [SCI-7625] 2023-02-09 12:37:35 +01:00
sboursen-scinote dc333f77d5 Update the Selector when a user is selected/deselected [SCI-7625] 2023-02-09 12:30:51 +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
aignatov-bio 15d1efa408
Merge pull request #4894 from okriuchykhin/ok_SCI_7718 
Add permission for protocol draft management [SCI-7718]
 2023-02-09 11:34:22 +01:00
sboursen-scinote 4083f0a065 Use YAGNI on the file [SCI-7685] 2023-02-08 11:53:04 +01:00
sboursen-scinote da1d8231cc Convert font-size unit to pt [SCI-7685] 2023-02-08 11:50:19 +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
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
Anton 94f8d139a1 Fix experiments sidebar sorting [SCI-7894] 2023-02-07 13:35:00 +01:00
aignatov-bio 6e570dcc9d
Merge pull request #4915 from aignatov-bio/ai-sci-7840-fix-headers-in-tinymce 
Fix heading styles for tinymce [SCI-7840]
 2023-02-07 13:25:02 +01:00
artoscinote ca183f1f76
Merge pull request #4944 from G-Chubinidze/gc_SCI_7883 
fixed tinymce stylings for all elements inside editing mode [SCI-7883]
 2023-02-07 13:11:03 +01:00
artoscinote 1a8cacaeb8
Merge pull request #4942 from artoscinote/ma_SCI_7886 
Disable all TinyMCE context menus [SCI-7886]
 2023-02-07 13:10:12 +01:00
Giga Chubinidze 3483c7ba56 fixed tinymce stylings for all elements inside editing mode 2023-02-07 16:00:14 +04:00
Giga Chubinidze 9e3073b11e step timestamp changes 2023-02-07 15:53:58 +04:00
Martin Artnik d0fd0efc1f Disable all TinyMCE context menus [SCI-7886] 2023-02-07 11:40:18 +01:00
ajugo 9caa5be4c0
Updated protocol actions select menu in task [SCI-7820] (#4939) 2023-02-07 10:39:49 +01:00
ajugo c2fcba729a
Add empty space in PDF report after asset link [SCI-7660] (#4940) 2023-02-07 10:39:11 +01:00
artoscinote 5a93cd1a12
Merge pull request #4921 from artoscinote/ma_SCI_7187 
Support compiling webpacker content from addons [SCI-7187]
 2023-02-07 10:24:18 +01:00
artoscinote b9be286802
Merge pull request #4908 from sboursen-scinote/sb_SCI-7674 
Inventories: archived by and archived on seen on active item list [SCI-7674]
 2023-02-07 10:23:28 +01:00
artoscinote db75d1cb34
Merge pull request #4938 from sboursen-scinote/sb_SCI-7831 
No warning message on modal, when importing existing protocol from protocols.io into My Protocols [SCI-7831]
 2023-02-06 16:59:08 +01:00
ajugo 29a7113cc1
Fix loading task steps and step timestamps [SCI-7902] (#4941) 2023-02-06 16:47:11 +01:00
sboursen-scinote 1614e3e52b Fix hound [SCI-7831] 2023-02-06 16:42:48 +01:00
sboursen-scinote 2fc5772af3 Catch RecordInvalid errors and remove uneeded error_format function [SCI-7831] 2023-02-06 16:36:52 +01:00
Martin Artnik ebd98bfb85 Make TinyMce init more extensible [SCI-7187] 2023-02-06 16:05:13 +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
sboursen-scinote 93851b8c90 Fix code style issues [SCI-7831] 2023-02-06 13:49:34 +01:00
sboursen-scinote 9023e8d1d4 Standarize the returned json when the request is not succesful [SCI-7831] 2023-02-06 13:31:11 +01:00
sboursen-scinote c39b660fe3 Format error before sending it from back-end [SCI-7831] 2023-02-06 13:29:15 +01:00
artoscinote 2af2479808
Merge pull request #4937 from artoscinote/ma_SCI_6359 
Fix multiple route helper incluions [SCI-6359]
 2023-02-06 13:08:04 +01:00
Martin Artnik 7c6cca0615 Fix multiple route helper incluions [SCI-6359] 2023-02-06 13:03:12 +01:00
artoscinote 3331c5fa3f
Merge pull request #4928 from G-Chubinidze/gc_SCI_7837 
Step timestamp display [SCI-7837]
 2023-02-06 12:03:02 +01:00
ajugo 442fd5e971
Fix protocol printing dialog [SCI-7889] (#4933) 2023-02-06 11:34:59 +01:00
sboursen-scinote a78f113498 Update the style of the form-group with errors [SCI-7831] 2023-02-06 11:31:25 +01:00
artoscinote 41644d70ea
Merge pull request #4934 from G-Chubinidze/gc_SCI_7883 
Update the TinyMCE font [SC-7883]
 2023-02-06 11:19:29 +01:00
artoscinote d8c5bcedd1
Merge pull request #4926 from okriuchykhin/ok_SCI_7761 
Allow user management on archived projects [SCI-7761]
 2023-02-06 11:18:39 +01:00
ajugo 5104dab5b4
Show parent id for inventory snapshot items in exported excel [SCI-7671] (#4907) 2023-02-06 11:18:19 +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
artoscinote d9beafd9a7
Merge pull request #4903 from sboursen-scinote/sb_SCI-7676 
CSS: error messages at moving experiment [SCI-7676]
 2023-02-06 11:12:45 +01:00
sboursen-scinote 43680f1295 Remove the key prefix (e.g. Name:) from the form-control error message [SCI-7831] 2023-02-06 11:12:32 +01:00
Giga Chubinidze f3a4f316bb Update the TinyMCE font [SC-7883] 2023-02-05 23:02:59 +04:00
Giga Chubinidze 9595f434d0 on/at convention fix 2023-02-05 23:00:20 +04:00
Alex Kriuchykhin 958f9784b0
Add minimum length validation to label template name [SCI-7319] (#4930) 2023-02-03 15:36:32 +01:00
Giga Chubinidze ac4b090560 slight style refactor 2023-02-03 13:38:03 +04:00
sboursen-scinote ada165264a Bring the information flyout to the foreground in task panel [SCI-7832] 2023-02-03 08:25:07 +01:00
Giga Chubinidze ed4363484a Step timestamp display [SCI-7837] 2023-02-03 11:12:33 +04:00
Martin Artnik ae7fce446b Don't touch steps when commenting [SCI-7584] 2023-02-02 16:28:23 +01:00
Oleksii Kriuchykhin 53fca4f022 Allow user managment on archived projects [SCI-7761] 2023-02-02 15:09:45 +01:00
Alex Kriuchykhin 15ac306244
Fix user auto linking with Azure AD [SCI-7764] (#4924) 2023-02-02 13:27:49 +01:00
Oleksii Kriuchykhin 8eafe0fd4a Fix Azure and Okta sign in links [SCI-7764] 2023-02-02 11:20:02 +01:00
Soufiane 937c8564f0
Update Invite new user to team modal [SCI-6007] (#4854) 
Update Invite new user to team modal [SCI-6007]
 2023-02-01 16:27:50 +01:00
Alex Kriuchykhin dadb2fdf06
Merge pull request #4909 from okriuchykhin/ok_SCI_7816 
Fix date time inventories reminder processing [SCI-7816]
 2023-02-01 16:26:54 +01:00
Oleksii Kriuchykhin e887e7c82b Merge branch 'develop' into features/sso-improvements 2023-02-01 16:08:56 +01:00
Alex Kriuchykhin 94806047c0
Make SSO feature switchable [SCI-7764] (#4916) 2023-02-01 15:43:20 +01:00
Anton a784518464 Fix heading styles for tinymce [SCI-7840] 2023-02-01 14:01:38 +01:00
aignatov-bio 39e213104b
Merge pull request #4914 from aignatov-bio/ai-sci-7826-fix-comments-css-in-experiment-table 
Fix comments css in experiment table [SCI-7826]
 2023-02-01 14:00:43 +01:00
ajugo 6fcb9152dc
Fix CSS for generated pdf/docx reports [SCI-7660] (#4911) 
* Fix CSS for generated pdf/docx reports [SCI-7660]

* Call correct asset previewable function [SCI-7660]
 2023-02-01 12:01:18 +01:00
Anton e6baf20198 Fix comments css in experiment table [SCI-7826] 2023-02-01 11:42:43 +01:00
aignatov-bio e2da83ee6e
Merge pull request #4904 from aignatov-bio/ai-sci-7822-fix-dimension-calculation 
Fix label template logo dimension calculation [SCI-7822]
 2023-02-01 11:27:06 +01:00
ajugo cb3334e818
Fix datetime in repository advanced filters [SCI-7514] (#4910) 2023-02-01 10:33:36 +01:00
artoscinote 3742dc1e54
Merge pull request #4899 from sboursen-scinote/sb_SCI-7818 
Default sorting in tables is saved (user specific) [SCI-7818]
 2023-02-01 09:36:23 +01:00
artoscinote 5bd0a49550
Merge pull request #4895 from sboursen-scinote/sb_SCI-7811 
Fix: Edit title mode does not close [SCI-7811]
 2023-02-01 09:35:53 +01:00
artoscinote c88e63f8d9
Merge pull request #4893 from G-Chubinidze/gc_SCI_7813 
Lost sorting selection on experiment table view [SCI-7813]
 2023-02-01 09:30:27 +01:00
artoscinote 07b584e111
Merge pull request #4890 from G-Chubinidze/gc_SCI_7627 
My profile page updates of user data [SCI-7627]
 2023-02-01 09:29:37 +01:00
sboursen-scinote aaabf862a4 Hide module-tag-manage-modal controls when the user is not autorized [SCI-7814] 2023-01-31 15:42:43 +01:00
Alex Kriuchykhin e1c4aa9469
Move Okta and Azure AD configurations to application settings [SCI-7609] (#4732) 2023-01-31 11:55:31 +01:00
aignatov-bio 8ad21fea35
Finalize access managment for protocol [SCI-7677] (#4853) 2023-01-31 10:34:32 +01:00
sboursen-scinote 57838dc813 Reduce the height of the bluring element [SCI-7676] 2023-01-31 09:36:24 +01:00
aignatov-bio 1f1b51357c
Let multiple users to manage office files in results [SCI-7757] (#4902) 2023-01-30 17:48:37 +01:00
Oleksii Kriuchykhin fa96a9a939 Fix date time inventories reminder processing [SCI-7816] 2023-01-30 17:07:27 +01:00
sboursen-scinote 408dd7dcd8 Reinitialize the Table when switching the View from archived to active [SCI-7674] 2023-01-30 15:33:08 +01:00
Anton 68f2db7996 Fix label template logo dimenstion calculation [SCI-7822] 2023-01-30 12:59:51 +01:00
sboursen-scinote 38412af02a Fix Hound issues [SCI-7676] 2023-01-30 12:32:55 +01:00
sboursen-scinote 6f153fe79a Fix Hound issues [SCI-7676] 2023-01-30 12:31:45 +01:00
sboursen-scinote 3112597e62 Fix the text more overlaping with the cell description [SCI-7676] 2023-01-30 12:24:25 +01:00
sboursen-scinote 42eae72d2a Update the layout of the move-experiment-modal when there are errors [SCI-7676] 2023-01-30 12:00:33 +01:00
sboursen-scinote 3f355ac108 Revert change to default table sorting [SCI-7818] 2023-01-27 15:54:34 +01:00
sboursen-scinote 4be094680a Enable inventories datatable settings saving in localStorage [SCI-7818] 2023-01-27 14:44:39 +01:00
sboursen-scinote ae61d34a71 Enable reports datatable settings saving in localStorage [SCI-7818] 2023-01-27 14:28:50 +01:00
Alex Kriuchykhin e7c61d6fd9
Fix smart annotation inventory items flyout, case with no available inventories [SCI-7824] (#4898) 2023-01-27 14:16:52 +01:00
Alex Kriuchykhin 02da980ab8
Fix task protocol editing with empty description [SCI-7823] (#4897) 2023-01-27 14:15:09 +01:00
sboursen-scinote 1dc0c8dcdf Enable label template datatable settings saving in localStorage [SCI-7818] 2023-01-27 14:10:32 +01:00
aignatov-bio 667e0be9f6
Add ability to move archived tasks [SCI-7733] (#4892) 2023-01-27 10:40:01 +01:00
Oleksii Kriuchykhin 6ac64aaf34 Add permission for protocol draft management [SCI-7718] 2023-01-26 15:41:41 +01:00
sboursen-scinote d6194da3c6 Cancel action on Enter [SCI-7811] 2023-01-26 15:29:08 +01:00
sboursen-scinote 134acadb41 Cancel editing on Tab [SCI-7811] 2023-01-26 15:15:40 +01:00
Giga Chubinidze a0a81eee1c My profile page updates of user data [SCI-7627] 2023-01-26 17:01:54 +04:00
Giga Chubinidze 1fbce23788 Lost sorting selection on experiment table view [SCI-7813] 2023-01-26 17:00:03 +04:00
Anton 466c25175f Add manage actions to version modal [SCI-7520] 2023-01-26 12:39:11 +01:00
sboursen-scinote 2e037b69ff Fix Hound related issue [SCI-7585] 2023-01-26 09:23:37 +01:00
sboursen-scinote 36cc68f94a Fix Hound related issue [SCI-7585] 2023-01-26 09:20:20 +01:00