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

1704 commits

Author SHA1 Message Date
artoscinote b3275feedb
Merge pull request #5276 from G-Chubinidze/gc_SCI_7633_v2 
updated device table stylings
 2023-04-11 10:18:59 +02:00
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
sboursen-scinote b66960f41b Fix load protocol template header wording [SCI-8223] 2023-04-07 17:42:00 +02:00
Giga Chubinidze ceba49acb4 grant access new name, padding update on publish modal 2023-04-06 17:12:56 +04:00
ajugo 3ad1d384ee
Raise character limit for rich text fields and reword limit text error [SCI-7959] (#5221) 2023-04-05 15:34:48 +02:00
Soufiane 4985c2eb88
Added Published on & Published by to Protocol details screen [SCI-8193] (#5239) 
Added Published on & Published by to Protocol details screen [SCI-8193]
 2023-04-05 15:08:31 +02:00
Soufiane 1a1956e163
Change wording for access management to cover project and templates (EDIT 2) [SCI-8231] (#5251) 
* Use I18n [SCI-8231]

* Consolidate the message translations [SCI-8231]
 2023-04-04 11:55:00 +02:00
ajugo 91c32e415f
Add missing translation for flash [SCI-8238] (#5243) 2023-04-03 14:37:48 +02:00
Anton 52aac69488 Add final version for left menu [SCI-8016] 2023-04-03 13:29:24 +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
sboursen-scinote 852108df0b Change flash messages for protocol access permission [SCI-8231] 2023-03-31 18:45:32 +02:00
Giga Chubinidze 3fc2afde3c Label '(Draft)' in front of the protocol template name [SCI-8211] 2023-03-31 18:30:26 +04:00
sboursen-scinote 95797ab8dd Implement layout breadcrumbs for Inventories [SCI-8087] 2023-03-30 18:42:27 +02:00
Giga Chubinidze 57d951a690 Change title for publishing draft [SCI-8232] 2023-03-30 20:30:49 +04:00
ajugo e1cf9775fd
Add new activites for all team members [SCI-8224] (#5227) 2023-03-30 16:04:57 +02:00
Martin Artnik 1f5fa19d80 Add missing translation [SCI-8131] 2023-03-27 15:26:59 +02:00
ajugo 26879f200d
Fix CSS for protocol versioning modal [SCI-8194] (#5197) 2023-03-27 13:28:00 +02:00
Anton 1177eaae5b Add general notifiacitons flyout [SCI-8017] 2023-03-25 17:34:26 +01:00
aignatov-bio d8083b84b6
Merge pull request #5184 from aignatov-bio/ai-sci-8185-css-fixes 
Fix tables css [SCI-8185]
 2023-03-24 13:14:38 +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
Anton 4edad3f41c Fix tables css [SCI-8185] 2023-03-23 13:05:37 +01:00
Anton 854fc1764b Refactor left/top navigation [SCI-8055] 2023-03-22 14:08:21 +01:00
Oleksii Kriuchykhin 7fff3e8f78 Merge branch 'hotfix/1.26.6.2' into develop 2023-03-20 15:36:49 +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
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
ajugo 7c287b3993
Reword project access permissions [SCI-8124] (#5146) 2023-03-15 13:53:43 +01: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
Alex Kriuchykhin d82470aa03
Improve handling and escaping of special characters in input fields [SCI-8125] (#5135) 2023-03-13 18:00:30 +01:00
sboursen-scinote d2ceeb9662 Use I18n [SCI-8007] 2023-03-12 14:10:07 +01:00
sboursen-scinote 55ebb4817e Fix hound [SCI-8007] 2023-03-10 09:16:50 +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
Anton ca5f61a0e2 Add all team members through access modal [SCI-8063] 2023-03-09 14:13:01 +01:00
artoscinote a503aa1a9f
Add create draft activity name [SCI-8093] 2023-03-08 10:25:11 +01:00
Martin Artnik e4e8997cc1 Add draft created activity [SCI-8093] 2023-03-07 14:45:52 +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
Alex Kriuchykhin f8a4e7ee65
Update logic for linked protocol templates with task [SCI-7973] (#5058) 2023-03-07 13:03:01 +01: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
Martin Artnik 5e6f0fad83 Access modal translation amends [SCI-8060] 2023-03-07 12:14:02 +01:00
Anton ece09ee9a5 Add empty state for protocol actions toolbar [SCI-8077] 2023-03-07 11:44:03 +01:00
Anton ca76c78a23 Fix protocol creation error message [SCI-8003] 2023-03-06 19:31:45 +01:00
sboursen-scinote 34f324f7ca Update the sort component [SCI-8045] 2023-03-06 12:00:53 +01:00
aignatov-bio 47c59ecc6c
Fix protocol copy/save message [SCI-8064] (#5079) 2023-03-06 11:51:40 +01:00
sboursen-scinote 587606803b Update search placeholder [SCI-8045] 2023-03-06 09:28:21 +01:00
sboursen-scinote 443ee4350c Fix protocol repository sidebar on archived view [SCI-8030] 2023-03-03 14:11:40 +01:00
sboursen-scinote 515baa8de7 Update translations [SCI-8032] 2023-03-03 11:03:04 +01:00
ajugo 72cf844c3e
Fix protocol version modification info text [SCI-8061] (#5064) 2023-03-02 15:35:02 +01:00
ajugo 671e7dc2df
Remove double text in unlink/revert protocol modal [SCI-8052] (#5056) 2023-03-02 09:57:21 +01:00
Soufiane 3760073e87
Merge branch 'features/protocol_versioning' into sb_SCI-7909 2023-02-28 15:37:35 +01:00
Soufiane 2aee34ce56
Merge pull request #4955 from sboursen-scinote/sb_SCI-7904 
Protocol templates - delete all steps (tasks screen) [SCI-7904]
 2023-02-28 15:33:33 +01:00
Soufiane 53f2bc3be0
Merge pull request #4977 from sboursen-scinote/sb_SCI-7910 
Protocol templates - revert action and alert message [SCI-7910]
 2023-02-28 15:33:05 +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
sboursen-scinote 1c9d9d8082 Add a small refactor [SCI-7910] 2023-02-28 14:13:18 +01:00
sboursen-scinote e29bdcb51f Revome uneeded I18n config [SCI-7910] 2023-02-28 12:04:29 +01:00
sboursen-scinote 66edffe53a Use I18n [SCI-7910] 2023-02-28 12:03:00 +01:00
sboursen-scinote e8cbc0364f Change the tanslation [SCI-7909] 2023-02-28 11:39:49 +01:00
ajugo 0328a32e09
Update import/export for protocol templates [SCI-7986] (#5032) 2023-02-27 13:22:01 +01:00
sboursen-scinote af48cede1f Update protocol repository default view styles [SCI-7996] 2023-02-27 09:58:28 +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
Anton 60cda9b6f2 Fix version number for draft [SCI-7989] 2023-02-24 15:32:10 +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
artoscinote 8f8865c73c
Fix MarvinJS image toolbar issues [SCI-7934] (#4998) 2023-02-21 09:12:59 +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
sboursen-scinote 0039edae66 Update the style of the revert protocol modal [SCI-7910] 2023-02-15 09:26:46 +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
Anton dc5cfb9fc3 Add publish and delete action [SCI-7905] 2023-02-13 14:45:22 +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
sboursen-scinote 74773b773c Update the text of the delete all steps modal [SCI-7904] 2023-02-09 15:49:38 +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
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
Giga Chubinidze 9e3073b11e step timestamp changes 2023-02-07 15:53:58 +04:00
ajugo 9caa5be4c0
Updated protocol actions select menu in task [SCI-7820] (#4939) 2023-02-07 10:39:49 +01:00
ajugo d66dc98300
Update print protocol modal [SCI-7830] (#4932) 2023-02-06 14:23:56 +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
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
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 ed4363484a Step timestamp display [SCI-7837] 2023-02-03 11:12:33 +04:00
Oleksii Kriuchykhin e887e7c82b Merge branch 'develop' into features/sso-improvements 2023-02-01 16:08:56 +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
Giga Chubinidze a0a81eee1c My profile page updates of user data [SCI-7627] 2023-01-26 17:01:54 +04:00
sboursen-scinote eced08e365 Add a dot in empty canvas sentence [SCI-7676] 2023-01-26 13:17:46 +01:00
Anton 466c25175f Add manage actions to version modal [SCI-7520] 2023-01-26 12:39:11 +01:00
aignatov-bio a72de2800f
Merge pull request #4871 from aignatov-bio/ai-sci-7619-refactor-access-modals-pet 
Refactor access modals P/E/T [SCI-7619]
 2023-01-24 10:14:40 +01:00
Anton 00b792b1bb UX changes for permission modal [SCI-7619] 2023-01-23 16:01:40 +01:00
Anton 37eb902b25 Refactor access modals P/E/T [SCI-7619] 2023-01-22 22:23:18 +01:00
Alex Kriuchykhin 7f3999fa4f
Add protocol published versions modal [SCI-7519] (#4725) 2023-01-20 14:29:25 +01:00
artoscinote 7c0e3865cf
Merge pull request #4829 from G-Chubinidze/gc_SCI_7749 
Filter modal on task table view - placeholder text [SCI-7749]
 2023-01-17 13:25:37 +01:00
ajugo 1e01d1f2b7
Fix missing translation for field codes [SCI-7765] (#4826) 2023-01-16 10:21:10 +01:00
Giga Chubinidze 39280d35b0 Filter modal on task table view - placeholder text [SCI-7749] 2023-01-16 11:23:54 +04:00
sboursen-scinote b55ca5b8cf Update Experiment edit button text from 'Edit Workflow' to 'Edit workflow' in Canvas view [SCI_7736] 2023-01-13 13:39:49 +01:00
Alex Kriuchykhin d4b0f0da9d
Merge pull request #4819 from scinote-eln/features/label-template-logo 
Features/label template logo
 2023-01-13 11:58:01 +01:00
ajugo d8adbb1d3d
Implement completed and due date changes [SCI-7725] (#4816) 2023-01-13 10:18:35 +01:00
aignatov-bio 9216ca2809
Merge pull request #4811 from aignatov-bio/ai-sci-7722-add-new-task-modal-improvments 
Experiment table - add new task modal improvements [SCI-7722]
 2023-01-13 10:13:22 +01:00
artoscinote c75d50c2de
Merge pull request #4807 from G-Chubinidze/gc_SCI_7724 
Manage tags modal improvements [SCI-7724]
 2023-01-13 09:28:27 +01:00
Anton 7930091abb Experiment table - add new task modal improvments [SCI-7722] 2023-01-12 13:48:49 +01:00
ajugo b8e5c98210
Canvas updates - actions and Create task modal [SCI-7723] (#4809) 2023-01-12 13:30:55 +01:00
Giga Chubinidze 1dc636a49c Manage tags modal improvements [SCI-7724] 2023-01-12 16:01:39 +04:00
aignatov-bio 3ea6c4e5ae
Merge pull request #4791 from aignatov-bio/ai-sci-7698-update-new-tag-option-design 
Update tag creation option design [SCI-7698]
 2023-01-10 14:55:54 +01:00
sboursen-scinote 2e0b8eaf1e Change icon for Due first to fit the global style [SCI-7705] 2023-01-10 13:08:50 +01:00
Anton ba442babe2 Update tag creation option design [SCI-7698] 2023-01-10 13:07:10 +01:00
artoscinote 3ce601dfa7
Merge pull request #4778 from artoscinote/ma_SCI_7382 
Add duplicating tooltips [SCI-7382]
 2023-01-10 11:56:33 +01:00
artoscinote 4ecf208243
Merge pull request #4780 from artoscinote/ma_SCI_7683 
Fix task access modal for archived experiments [SCI-7683]
 2023-01-10 11:51:47 +01:00
Martin Artnik da5324d2a1 Fix task access modal for archived experiments [SCI-7683] 2023-01-09 16:04:57 +01:00
Soufiane Boursen a6d245d5f2 Fix wrong icon for Due last [SCI-7705] 2023-01-09 13:52:02 +01:00
Martin Artnik d4326c08db Add duplicating tooltips [SCI-7382] 2023-01-09 12:40:00 +01:00
aignatov-bio feb596179f
Merge pull request #4772 from aignatov-bio/ai-sci-7691-fix-new-task-modal-styling 
Experiment table - fix new task modal CSS [SCI-7691]
 2023-01-06 20:28:24 +01:00
aignatov-bio d9426c5920
Merge pull request #4771 from aignatov-bio/ai-sci-7688-fix-experiment-table-comments-tooltip 
Experiment table - fix comments header tooltip [SCI-7688]
 2023-01-06 13:11:02 +01:00
Anton 7a7d2c0e1b Experiment table - fix new task modal CSS [SCI-7691] 2023-01-06 13:04:29 +01:00
Anton 52707fdcf8 Experiment table - fix comments header tooltip [SCI-7688] 2023-01-06 12:19:05 +01:00
Anton 802e0e602b Experiment table - fix view moda for assigned users [SCI-7693] 2023-01-06 11:44:48 +01:00
artoscinote 631608e7db
Merge pull request #4761 from G-Chubinidze/gc_SCI_7679 
Incorrect translation on the 'Edit Workflow' button in experiment canvas [SCI-7679]
 2023-01-06 10:55:01 +01:00
Giga Chubinidze 035b8831c6 Incorrect translation on the 'Edit Workflow' button in experiment canva [SCI-7679] 2023-01-06 11:47:50 +04:00
aignatov-bio 6af72a28ee
Merge pull request #4715 from aignatov-bio/ai-sci-7559-add-step-text-notification 
Add new step text notification [SCI-7559]
 2023-01-04 10:06:57 +01:00
Anton 9c488d5a0c Add new access user modal [SCI-7518] 2023-01-03 14:43:03 +01:00
ajugo 67b4ccf634
Add missing text (#4736) 2022-12-22 14:38:22 +01:00
aignatov-bio ea661f3c19
Merge branch 'develop' into features/new_experiment_views 2022-12-22 13:33:25 +01:00
Anton d1a68adb22 Add access modal for protocols [SCI-7518] 2022-12-22 13:27:46 +01:00
ajugo b549938f13
Fix print modal css [SCI-7437] (#4648) 2022-12-22 11:09:20 +01:00
aignatov-bio 7437af540b
Merge pull request #4701 from okriuchykhin/ok_SCI_7516 
Add versions and access columns to protocols table, update protocol model [SCI-7516]
 2022-12-21 13:03:38 +01:00
aignatov-bio e3036d923b
Merge pull request #4686 from G-Chubinidze/gc_SCI_7496 
The View flyout in the Archived tasks view [SCI-7496]
 2022-12-20 15:19:58 +01:00
G-Chubinidze f463664885
Merge pull request #4724 from G-Chubinidze/gc_SCI_7449 
FE | BE Add new task modal field for Tags [SCI-7449]
 2022-12-20 15:50:15 +04:00
Oleksii Kriuchykhin 5fea4722ac Add versions and access columns to protocols table, update protocol model [SCI-7516] 2022-12-19 15:39:32 +01:00
ajugo 5ab804c35a
Implement general protocol repository toolbar [SCI-7557] (#4698) 
* Implement general protocol repository toolbar [SCI-7557]

* Move protocolsio page [SCI-7557]
 2022-12-19 13:18:24 +01:00
Giga Chubinidze 1a84c60c74 FE | BE Add new task modal field for Tags [SCI-7449] 2022-12-19 14:55:38 +04:00
Anton 8e1e95b219 Add new step text notification [SCI-7559] 2022-12-13 14:47:53 +01:00
G-Chubinidze 0b27f0d973
Merge branch 'features/new_experiment_views' into gc_SCI_7496 2022-12-12 17:53:22 +04:00
Alex Kriuchykhin 9094dc08b5
Merge pull request #4671 from okriuchykhin/ok_SCI_7513 
Add versioning implementation to protocols data layer [SCI-7513]
 2022-12-12 14:37:50 +01:00
Anton 6b6105dfe6 CSS fixes for exposed ID [SCI-7586] 2022-12-12 11:45:59 +01:00
aignatov-bio 66b0968b66
Merge pull request #4696 from aignatov-bio/ai-sci-7552-add-company-logo-to-label-templates 
Add logo to label templates [SCI-7552]
 2022-12-09 13:36:27 +01:00