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
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
ajugo
7c287b3993
Reword project access permissions [SCI-8124] ( #5146 )
2023-03-15 13:53:43 +01:00
sboursen-scinote
c6bb9850ea
Merge feature/protocol_versioning into sb_SCI-8007 [SCI-8007]
2023-03-15 09:24:45 +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
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
d2ceeb9662
Use I18n [SCI-8007]
2023-03-12 14:10:07 +01:00
Alex Kriuchykhin
cb1c49762a
Revert "Protocol permissions - button display [SCI-8058]" ( #5121 )
2023-03-10 11:45:32 +01:00
sboursen-scinote
55ebb4817e
Fix hound [SCI-8007]
2023-03-10 09:16:50 +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
Anton
ca5f61a0e2
Add all team members through access modal [SCI-8063]
2023-03-09 14:13:01 +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
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
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
d801677392
Merge branch 'develop' into sb_SCI-7562
2023-03-07 12:52:05 +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
Martin Artnik
ac0e0ba853
Fix asset initializer [SCI-7974]
2023-03-01 15:31:22 +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
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
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
Martin Artnik
219814ec06
Change protocol clone to support bulk in future [SCI-7990]
2023-02-28 13:11:49 +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
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
sboursen-scinote
af48cede1f
Update protocol repository default view styles [SCI-7996]
2023-02-27 09:58:28 +01:00
ajugo
58fdcc785f
Make supporting material variable [SCI-6593] ( #5014 )
2023-02-24 17:57:10 +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
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
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
artoscinote
6400745b0c
Merge pull request #4984 from artoscinote/ma_SCI_7937
...
Fix table of contents, add image download tooltip [SCI-7937]
2023-02-17 14:59:01 +01:00
Martin Artnik
43f6a8e66f
Fix table of contents, add image download tooltip [SCI-7937]
2023-02-17 10:36:47 +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
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
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
Martin Artnik
8f6d1f7872
Fix webpack if no addons are present [SCI-7916]
2023-02-14 10:43:55 +01:00
Anton
dc5cfb9fc3
Add publish and delete action [SCI-7905]
2023-02-13 14:45:22 +01:00
Martin Artnik
f880ea46ce
Add connected device logging [SCI-7632]
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
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
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
artoscinote
77b4a557f1
Merge pull request #4881 from artoscinote/ma_SCI_7631
...
Throw error when authenticating with revoked tokens [SCI-7631]
2023-02-07 13:39:03 +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
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
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
e917b995cb
added route
2023-02-06 13:54:54 +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
Martin Artnik
a26d26a695
Support compiling webpacker content from addons [SCI-7187]
2023-02-03 12:03:50 +01:00
Giga Chubinidze
ed4363484a
Step timestamp display [SCI-7837]
2023-02-03 11:12:33 +04: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
e1c4aa9469
Move Okta and Azure AD configurations to application settings [SCI-7609] ( #4732 )
2023-01-31 11:55:31 +01:00
Oleksii Kriuchykhin
fa96a9a939
Fix date time inventories reminder processing [SCI-7816]
2023-01-30 17:07:27 +01:00
Oleksii Kriuchykhin
6ac64aaf34
Add permission for protocol draft management [SCI-7718]
2023-01-26 15:41:41 +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
sboursen-scinote
217561e809
Set the default sotring of inventory items datatable to asc on name [SCI-7562]
2023-01-25 16:11:33 +01:00
Martin Artnik
8345f4ac5d
Throw error when authenticating with revoked tokens [SCI-7631]
2023-01-24 15:57:59 +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
artoscinote
0747f414eb
Merge pull request #4824 from sboursen-scinote/sb_SCI-7736
...
Position of Experiment and View buttons update [SCI-7736]
2023-01-16 10:17:59 +01:00
Giga Chubinidze
39280d35b0
Filter modal on task table view - placeholder text [SCI-7749]
2023-01-16 11:23:54 +04:00
artoscinote
80eb1639bc
Merge pull request #4823 from scinote-eln/features/tiny_mce_6
...
Features/tiny mce 6
2023-01-13 13:53:03 +01: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
ajugo
67dcbb0fa6
Open the correct experiment view [SCI-7662][SCI-7741] ( #4798 )
...
* Fix experiment view loading [SCI-7662]
* Fix experiment view loading [SCI-7662]
2023-01-12 11:31:04 +01: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
19b282cba2
Merge branch 'develop' into features/tiny_mce_6
2023-01-10 11:13:23 +01:00
ajugo
ef8b8344fd
Saving selected experiment view [SCI-7662] ( #4779 )
2023-01-10 11:08:49 +01:00
Alex Kriuchykhin
6c313f86ac
Merge pull request #4680 from okriuchykhin/ok_SCI_7455
...
Add API endpoint for retrieving a list of users [SCI-7455]
2023-01-10 10:21:23 +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
Oleksii Kriuchykhin
b29aeab67a
Add API endpoint for retrieving a list of users [SCI-7455]
2023-01-06 16:33:00 +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
Martin Artnik
4e779e70a4
Merge branch 'develop' into features/tiny_mce_6
2023-01-04 14:21:02 +01:00
Alex Kriuchykhin
2ea5000ea5
Merge pull request #4737 from okriuchykhin/ok_SCI_7643
...
Add missing permissions for inventories and protocols [SCI-7643]
2023-01-04 13:22:33 +01: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
Oleksii Kriuchykhin
06f3c34e3a
Add missing permissions for inventories and protocols [SCI-7643]
2022-12-22 16:46:26 +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
711dcfc7ac
Update Omniauth, Azure and Okta strategies [SCI-7284]
2022-12-19 16:43:24 +01: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
G-Chubinidze
10f31c8796
Merge pull request #4687 from G-Chubinidze/gc_SCI_7442
...
BE: Column display switch (Task data display) [SCI-7442]
2022-12-12 17:51:58 +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
Anton
c5d91b061b
Add logo to label templates
2022-12-09 13:33:10 +01:00
artoscinote
a3e8000360
Merge branch 'develop' into features/exposed_ids
2022-12-08 15:58:11 +01:00
ajugo
add6554732
Connect experiment options to the table view [SCI-7554] ( #4692 )
2022-12-07 14:51:48 +01:00
Martin Artnik
c828d02b99
Merge branch 'develop' into features/tiny_mce_6
2022-12-07 14:07:43 +01:00
Giga Chubinidze
13972e6c33
CSS: sorting, experiment card, task card[SCI-7558]
2022-12-07 10:22:29 +04:00
G-Chubinidze
d696128ae1
Merge branch 'features/new_experiment_views' into gc_SCI_7442
2022-12-06 20:15:14 +04:00
Giga Chubinidze
0bad40c00d
styling changes
2022-12-06 19:58:59 +04:00
Anton
2a8aaed7d1
Add actions toolbar to protocol repository [SCI-7521]
2022-12-06 15:54:50 +01:00
Giga Chubinidze
420ec69f20
BE: Column display switch (Task data display) [SCI-7442]
2022-12-06 17:51:11 +04:00
Giga Chubinidze
082745a3dc
The View flyout in the Archived tasks view
2022-12-06 03:23:22 +04:00
ajugo
4b83f77c5b
Add new task modal field for Assign users for experiment views [SCI-7450] ( #4670 )
...
* Add new task modal field for Assign users for experiment views [SCI-7450]
* Fix loading users assigned to the experiment [SCI-7450]
* Fix task creation on experiment if none exists [SCI-7450]
2022-12-05 12:55:57 +01:00
ajugo
02f039ffed
Implement sorting for experiment table view [SCI-7451] [SCI-7497] ( #4659 )
...
* Implement experiment table sort flyout [SCI-7451]
* Implement archive sort options for experiment table [SCI-7497]
* Fix hound [SCI-7451]
* Clean code for experiment table view sorting [SCI-7497]
* Fix hound [SCI-7451]
2022-12-05 10:30:20 +01:00
G-Chubinidze
df4ac4d5b3
Merge pull request #4429 from G-Chubinidze/gc_SCI_7172
...
Expose project IDs in tables & cards view [SCI-7172] [SCI-7173] [SCI-7201]
2022-12-02 20:16:05 +04:00
Oleksii Kriuchykhin
78660fb1aa
Improve sorting of task results [SCI-7543]
2022-12-02 14:58:36 +01:00
aignatov-bio
7f87f850b3
Merge branch 'features/new_experiment_views' into ai-sci-7453-add-restore-task-to-experiment-table-view
2022-12-02 13:37:39 +01:00
ajugo
847280489a
Add report id to the report datatable [SCI-7199] ( #4453 )
...
* Add report id to the report datatable [SCI-7199]
* Remove report id migration [SCI-7199]
2022-12-02 11:41:32 +01:00
ajugo
7525ffeede
Add IDs to task cards in the canvas edit mode [SCI-7523] ( #4666 )
2022-12-02 11:40:57 +01:00
ajugo
8ff822c7e5
Implement due date column in experiment table view [SCI-7406] ( #4646 )
...
* Implement due date column in experiment table view [SCI-7406]
* Fix due date [SCI-7406]
* Move text to translation [SCI-7406]
* Fix table due date partial [SCI-7406]
* Fix table due date partial [SCI-7406]
2022-12-02 11:01:40 +01:00
artoscinote
eaf9017def
Merge pull request #4643 from artoscinote/ma_SCI_7206
...
Add exposed IDs to recent work [SCI-7206]
2022-12-02 10:16:51 +01:00
artoscinote
4664ef1d9b
Implement task cloning in experiments table [SCI-7382] ( #4653 )
...
* Implement task cloning in experiments table [SCI-7382]
* Fix provisioning status polling [SCI-7382]
* Remove unused method [SCI-7382]
* Fix linter issues [SCI-7382]
* Fix fetching last clone number [SCI-7382]
* Fixing experiment duplication [SCI-7382]
* Add truncation to cloned name [SCI-7382]
* Add readable scope to batch clone action [SCI-7382]
* Move 'Clone' to translations, simplify JS [SCI-7382]
2022-12-01 15:08:59 +01:00
Oleksii Kriuchykhin
b032cfbd35
Add task moving action to experiment table view [SCI-7381]
2022-12-01 13:33:07 +01:00
Oleksii Kriuchykhin
9b72474943
Add versioning implementation to protocols data layer [SCI-7513]
2022-11-30 19:52:36 +01:00
Anton
bd77433fce
Add user assignments dropdown for experiment table [SCI-7440]
2022-11-29 13:42:39 +01:00
Giga Chubinidze
8d97641110
Add IDs to pdf and docx reports [SCI-7200]
2022-11-29 11:38:08 +04:00
G-Chubinidze
fdc8d8ef24
Merge pull request #4654 from G-Chubinidze/gc_SCI_7175
...
Update sorting on Projects and Experiments pages [SCI-7175]
2022-11-28 15:57:46 +04:00
Anton
2901c7b627
Add restore action to experiment table [SCI-7453]
2022-11-28 12:45:18 +01:00
ajugo
9c88a34d99
Implement empty and loader for canvas view navigator [SCI-7445] ( #4651 )
2022-11-28 10:35:42 +01:00
Giga Chubinidze
ba0ebfbe29
Update sorting on Projects and Experiments pages [SCI-7175]
2022-11-26 01:18:54 +04:00
ajugo
80f66736b6
Add new task modal for experiment table view [SCI-7448] ( #4638 )
...
* Add new task modal for experiment table view [SCI-7448]
* Fix placeholder and size of the icon [SCI-7448]
* Reload experiment table [SCI-7448]
2022-11-24 14:49:42 +01:00
Anton
2e2086a03b
Add archived view for experiment table [SCI-7452]
2022-11-24 12:07:52 +01:00
Anton
440800537c
Add menu to experiment table row [SCI-7446]
2022-11-23 15:05:13 +01:00
Martin Artnik
2959cf6276
Add exposed IDs to recent work [SCI-7206]
2022-11-23 15:03:35 +01:00
Giga Chubinidze
47d593f0db
Missing navigate away pop up at inventory page [SCI-7492]
2022-11-23 15:38:01 +04:00
G-Chubinidze
415443a108
Merge pull request #4633 from G-Chubinidze/gc_SCI_7179
...
add IDs to the protocol templates tables [SCI-7179]
2022-11-22 14:50:57 +04:00
Giga Chubinidze
43f8370a08
add IDs to the protocol templates tables [SCI-7179]
2022-11-22 13:55:41 +04:00
Alex Kriuchykhin
dc9831d3bc
Merge pull request #4568 from rekonder/aj_SCI_7181
...
Remove old step code [SCI-7181]
2022-11-22 10:52:06 +01:00
ajugo
f2a680d826
Fix zebra printer print status [SCI-7474] ( #4625 )
2022-11-21 16:55:03 +01:00
Oleksii Kriuchykhin
49fbc2c561
Add basic modal for direct task creation [SCI-7197]
2022-11-18 17:00:11 +01:00
Anton
85c00c61e0
Add table columns display modal to experiment table [SCI-7441]
2022-11-16 09:54:12 +01:00
Anton
7523535e24
Add archive action to experiment table [SCI-7384]
2022-11-14 11:31:53 +01:00
Giga Chubinidze
5a429549da
archived tasks updates [SCI-7203]
2022-11-11 12:45:07 +04:00
aignatov-bio
4b6ab3bd25
Merge pull request #4544 from aignatov-bio/ai-sci-7233-fix-login-signup-forms
...
Fix css issues for login and signup forms [SCI-7233]
2022-11-10 11:15:03 +01:00
aignatov-bio
2c17c05c7d
Merge pull request #4260 from artoscinote/ma_SCI_6982
...
Implement multiline editing in repositories [SCI-6982][SCI-6983]
2022-11-10 11:07:30 +01:00
artoscinote
0994c4a25b
Merge branch 'develop' into ma_SCI_6982
2022-11-10 11:04:57 +01:00
aignatov-bio
0ee586a394
Merge pull request #4439 from rekonder/aj_SCI_7027
...
Session end implementation [SCI-7027]
2022-11-10 11:03:02 +01:00
Anton
63ce422367
Add basic filters for experiment table [SCI-7215]
2022-11-09 15:27:39 +01:00
Anton
a17cd78c20
Add view dropdown to experiment screen
2022-11-08 16:39:52 +01:00
Anton
7ceb94ab1f
Add toolbar to experiment table [SCI-7379]
2022-11-08 12:52:49 +01:00
Oleksii Kriuchykhin
c361dec0b6
Fix Fluics templates sync scheduler [SCI-7435]
2022-11-07 11:55:01 +01:00
Anton
34ffcbd8e8
Fix duplicate activities wording [SCI-7426]
2022-11-04 11:07:59 +01:00
Anton
bacd3524e8
Add tags manager to experiment table view [SCI-7368]
2022-11-02 15:17:10 +01:00
G-Chubinidze
81c5978805
Merge branch 'features/exposed_ids' into gc_SCI_7172
2022-10-28 15:05:38 +04:00
ajugo
22fad95efd
Rename protocol repository to templates [SCI-7418] ( #4587 )
2022-10-28 11:47:54 +02:00
ajugo
fedaf703d4
Add view button to experiment title bar [SCI-7216] ( #4579 )
2022-10-27 09:53:01 +02:00
ajugo
ea75eefd88
Change switching permission for label templates and zebra print to stock management [SCI-7305] ( #4574 )
2022-10-25 13:07:45 +02:00
ajugo
58bca40632
Change zebra label instructions [SCI-7390] ( #4572 )
2022-10-25 11:44:50 +02:00
Anton
8feaedc0d1
Add core columns to experiment table [SCI-7212]
2022-10-24 15:27:57 +02:00
Andrej
745be5a0f7
Remove old step code [SCI-7181]
2022-10-24 13:07:10 +02:00
Anton
bc86f11404
Add experiment table view [SCI-7174]
2022-10-21 12:22:38 +02:00
Anton
2ae8943d80
Update general canvas layout [SCI-7196]
2022-10-19 11:46:16 +02:00
Anton
689c34e54d
Fix css issues for login and signup forms [SCI-7233]
2022-10-18 11:54:10 +02:00
Oleksii Kriuchykhin
f0ea7ea2a4
Add option to disable local password log in [SCI-7298]
2022-10-12 10:30:09 +02:00
Oleksii Kriuchykhin
0e95b7ea66
Connect update fluics template button with controller action [SCI-7261]
2022-10-07 14:52:23 +02:00
artoscinote
77b91b467a
Merge pull request #4485 from rekonder/aj_SCI_7270
...
Add label printer modal to task [SCI-7270][7296]
2022-10-06 15:01:31 +02:00
Oleksii Kriuchykhin
b20c2b13a3
Fix label printers dropdown on print modal [SCI-7258]
2022-10-03 10:37:04 +02:00
Andrej
eebdee5129
Add label printer modal to task [SCI-7270]
2022-09-29 16:35:51 +02:00
Anton
9dc667f8e1
CSS fixes for label templates [SCI-7262]
2022-09-29 14:09:16 +02:00
Anton
3773fff093
Add label validation and preview in print modal [SCI-7255][SCI-7256]
2022-09-27 15:46:48 +02:00
ajugo
aa10259d40
Fix loading of zebra printers to modal and some other small fixes [SCI-7244] ( #4463 )
...
* Fix loading of zebra printers to modal and some other small fixes [SCI-7244]
* Fix zebra printing [SCI-7244]
2022-09-27 09:58:22 +02:00
Anton
40022a7012
Add initial VUE container for print dialog [SCI-7193]
2022-09-23 14:07:52 +02:00
ajugo
b7861f5fdb
Add zebra javascript print library [SCI-7245] ( #4455 )
2022-09-23 12:34:43 +02:00
ajugo
a3ea6e608c
Add validation to print modal and implement zpl printing [SCI-7052][SCI-7221] ( #4448 )
...
* Add validation to print modal [SCI-7052]
* Fix dropdown on label modal print [SCI-7052]
* Fix hound [SCI-7052]
* Rename validation endpoint [SCI-7052]
* Add zpl label printing and fix fluics printing [SCI-7221]
* Fix hound [SCI-7221]
2022-09-22 15:06:36 +02:00
ajugo
6f3a32f09f
Add label template dropdown to print dialog [SCI-7104] ( #4387 )
...
* Add label template dropdown to print dialog [SCI-7051]
* Add zebra printers in printing progress and modal [SCI-7104]
* Fix hound [SCI-7104]
* Fix hound [SCI-7104]
* Fix hound [SCI-7104]
* Clean code for zebra printer [SCI-7104]
2022-09-20 14:10:34 +02:00
Anton
17bf490fef
Add validation to label template code [SCI-7210]
2022-09-19 11:59:36 +02:00
Andrej
ec77c2a076
Merge branch 'develop' of https://github.com/rekonder/scinote-web into aj_SCI_7027
2022-09-16 10:44:07 +02:00
Andrej
ac7c873385
Session end implementation [SCI-7027]
2022-09-16 09:57:40 +02:00
Anton
7ccce8a6d8
Fix merge issues for templates
2022-09-15 13:48:41 +02:00
aignatov-bio
c0339b17be
Merge branch 'develop' into ai-sci-7108-add-duplication-functionality-to-steps
2022-09-15 11:25:25 +02:00
Anton
0c596bb701
Merge branch 'develop' into features/label-templates
2022-09-15 10:40:17 +02:00
Anton
d7990cb058
Add new permissions for label templates [SCI-7088]
2022-09-14 15:13:13 +02:00
aignatov-bio
4182194b31
Merge branch 'features/label-templates' into features/team-permissions
2022-09-14 14:34:02 +02:00
