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

2263 commits

Author SHA1 Message Date
sboursen-scinote 7a3d5e03f4 Refactore after review [SCI-8087] 2023-04-06 12:23:33 +02:00
Martin Artnik ffa626d53f Fix experiment canvas padding [SCI-8270] 2023-04-06 11:50:56 +02:00
artoscinote 80b25f695e
Merge pull request #5188 from sboursen-scinote/sb_SCI-7663 
CSS: slight move of the three dots button on cards view [SCI-7663]
 2023-04-05 15:27:48 +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
Giga Chubinidze eb7ff9a5ff Change of color and hover effect of x - action button for closing the modals [SCI-8140] 2023-04-03 19:32:22 +04:00
Anton 52aac69488 Add final version for left menu [SCI-8016] 2023-04-03 13:29:24 +02:00
sboursen-scinote ec0fe7cfd7 Fix Hound [SCI-8087] 2023-04-03 07:12: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 4a31b27852 added minimum z index on protocols table 2023-03-31 13:42:42 +04:00
sboursen-scinote 501279372c Style the breadcrumbs [SCI-8087] 2023-03-30 21:56:38 +02:00
Anton 4a5e0de54f Fix css for task protocol [SCI-8214] 2023-03-28 14:53:47 +02:00
ajugo 0ff5cdf9a8
Fix CSS for pdf/docx preview and some minor CSS fixes [SCI-8198] (#5204) 2023-03-27 15:31:27 +02:00
ajugo 26879f200d
Fix CSS for protocol versioning modal [SCI-8194] (#5197) 2023-03-27 13:28:00 +02:00
Alex Kriuchykhin 2bcb9d0639
Merge pull request #5207 from artoscinote/ma_SCI_8131 
Add error flash when assignment update fails [SCI-8131]
 2023-03-27 12:43:40 +02:00
Martin Artnik 9904c7aae3 Add error flash when assignment update fails [SCI-8131] 2023-03-27 12:38:01 +02:00
Giga Chubinidze 0358e113eb Add new colors to our variables in CSS [SCI-8169] 2023-03-27 13:35:01 +04:00
artoscinote ba57617384
Merge pull request #5195 from artoscinote/ma_SCI_8188 
Revert global modal changes [SCI-8188]
 2023-03-27 11:15:46 +02:00
Anton 1177eaae5b Add general notifiacitons flyout [SCI-8017] 2023-03-25 17:34:26 +01:00
sboursen-scinote 107d602521 Fix pixel perfect alignment in dropdown [SCI-8032] 2023-03-25 03:01:45 +01:00
Martin Artnik 27713bbd8a Revert global modal changes [SCI-8188] 2023-03-24 13:47:40 +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
sboursen-scinote 245b4bc5b0 Fix the slight move [SCI-7663] 2023-03-23 17:57:47 +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
Anton e626c53f78 PET and Protocol tabls fixes [SCI-8176][SCI-8180][SCI-8181] 2023-03-22 13:47:59 +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
G-Chubinidze a1c611ab1e
Revert "Archived experiments UI improvements [SCI-8086]" 2023-03-22 13:21:08 +04:00
Anton a684ff2656 CSS fixes for version modal [SCI-8155] 2023-03-20 11:46:01 +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
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
Soufiane bc900cd26d
Merge branch 'features/protocol_versioning' into sb_SCI-8108 2023-03-16 09:20:36 +01:00
sboursen-scinote d49a992dd4 Fix styles when protocol is published [SCI-8108] 2023-03-16 09:15:22 +01:00
Soufiane 5cc06aedf5
Old buttons at importing protocols.io protocol (update) [SCI-8032] (#5137) 
* Fix Small css inacuracies [SCI-8032]

* Remove the technician role [SCI-8032]

* Use permissions to filter the authorised roles [SCI-8032]
 2023-03-15 13:28:45 +01:00
G-Chubinidze 6ba6d98989
Merge pull request #5143 from G-Chubinidze/gc_SCI_8100 
increased active pagination size [SCI-8100]
 2023-03-15 14:17:35 +04:00
Giga Chubinidze 57721a01e4 increased active pagination size 2023-03-15 14:15:36 +04: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 821a9191e5
Merge pull request #5120 from G-Chubinidze/gc_SCI_8086 
Archived experiments UI improvements [SCI-8086]
 2023-03-14 13:07:49 +01:00
Soufiane 7b93ced541
CSS: Protocol template - Details [SCI-8108] (#5131) 
* Fix spacing issue in protocol details [SCI-8108]

* Fix spacing issue in protocol datatable [SCI-8108]

* Match the styles of the authors and the keywords to figma [SCI-8108]

* Fix broken dropdown footer [SCI-8108]

* Fix hound [SCI-8108]
 2023-03-14 12:54:13 +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
G-Chubinidze ef596a5579
Merge pull request #5076 from G-Chubinidze/gc_SCI_8008 
Incorrect bottom action bar states for Protocol templates [SCI-8008]
 2023-03-14 14:17:29 +04:00
Giga Chubinidze 0ffe9b619c Protocol templates table - linked tasks modal [SCI-7630] 2023-03-13 18:19:28 +04:00
sboursen-scinote 697cf6f19a Fix hound [SCI-8108] 2023-03-13 14:52:54 +01:00
sboursen-scinote 25b88519f9 Fix broken dropdown footer [SCI-8108] 2023-03-13 14:45:54 +01:00
Giga Chubinidze 3d11400311 Archived experiments UI improvements [SCI-8086] 2023-03-13 15:12:40 +04:00
Giga Chubinidze ca8375a867 hound fixes 2023-03-13 14:36:49 +04:00
sboursen-scinote 59f4768c4e Match the styles of the authors and the keywords to figma [SCI-8108] 2023-03-13 11:32:11 +01:00
Giga Chubinidze b59f922143 CSS: Pixel-perfect issues for Protocol templates [SCI-8100] 2023-03-13 14:25:04 +04:00
sboursen-scinote 4afac52ad3 Fix spacing issue in protocol datatable [SCI-8108] 2023-03-13 10:56:26 +01:00
sboursen-scinote 30d782d8bb Fix spacing issue in protocol details [SCI-8108] 2023-03-13 08:55:15 +01:00
sboursen-scinote c4bdbdec9a Merge branch 'features/protocol_versioning' into sb_SCI-8007 2023-03-09 16:35:36 +01:00
sboursen-scinote a419943e4e Merge 'protocol_versioning' into sb_SCI-8045 2023-03-09 16:29:40 +01:00
ajugo b1468df3e1
Fix checkboxes at the protocol template table [SCI-8099] (#5108) 2023-03-09 15:01:21 +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
Martin Artnik ca4a5360ed Fix protocol link and step delete modal styling [SCI-8109] 2023-03-09 13:53:52 +01:00
sboursen-scinote 19d58789b3 Fix protocol details [SCI-8045] 2023-03-08 20:51:47 +01:00
sboursen-scinote 45f3d05fdc Fix hound [SCI-8007] 2023-03-08 16:31:24 +01:00
sboursen-scinote b3f7c41548 Update the filter dropDown globaly [SCI-8007] 2023-03-08 16:25:10 +01:00
sboursen-scinote 4ec15ede61 Implement the linked_children dropdown and update the modal [SCI-8007] 2023-03-08 15:15:41 +01:00
Martin Artnik e6af78112c Update access modal sizing [SCI-8039] 2023-03-08 15:03:09 +01:00
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
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
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
Anton ece09ee9a5 Add empty state for protocol actions toolbar [SCI-8077] 2023-03-07 11:44:03 +01:00
sboursen-scinote 5e89f1f829 Update my_module protocol status dropdown [SCI-7991] 2023-03-07 05:48:20 +01:00
Martin Artnik 2f29477e02 Protocol/general user assignment changes and fixes [SCI-8039] 2023-03-06 16:43:46 +01:00
sboursen-scinote 03dc93b9b1 Remove outline on protocol otion [SCI-8045] 2023-03-06 14:24:02 +01:00
sboursen-scinote e325458f2e Add hover effect on datatable columns headers [SCI-8045] 2023-03-06 08:32:55 +01:00
Giga Chubinidze 3fd7937154 CSS: Incorrect paddings in the "Protocol info" modal [SCI-8054] 2023-03-05 02:25:25 +04:00
Giga Chubinidze ecf27c679e Incorrect bottom action bar states for Protocol templates [SCI-8008] 2023-03-04 23:03:41 +04:00
sboursen-scinote 678e54bdc4 Add hover effect on datatable head [SCI-7562] 2023-03-03 16:27:54 +01:00
sboursen-scinote f6ce634d1c Use ordinary cursor [SCI-7562] 2023-03-03 16:17:23 +01:00
sboursen-scinote c036c72243 Fix hound [SCI-7996] 2023-03-03 16:00:50 +01:00
sboursen-scinote 9e33fae006 Make table cell single lined and limit the max width [SCI-7996] 2023-03-03 15:59:29 +01:00
sboursen-scinote 0cd31d451d Fix hound [SCI-8032] 2023-03-03 11:06:12 +01:00
sboursen-scinote c3066292a0 Style the protocol-preview-modal [SCI-8032] 2023-03-03 09:17:09 +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
artoscinote 54de76342e
Merge pull request #5036 from sboursen-scinote/sb_SCI-7981 
Fix TOC style [SCI-7981]
 2023-03-01 09:47:56 +01:00
aignatov-bio 922beecd74
Merge pull request #4959 from sboursen-scinote/sb_SCI-7772 
CSS:Uneven spacing around the check button [SCI-7772]
 2023-03-01 09:42:09 +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
sboursen-scinote b6ddb79183 Change the action-toolbar behavior after input from product team [SCI-7996] 2023-02-28 15:47:06 +01:00
aignatov-bio bce0c9549d
Merge pull request #5039 from aignatov-bio/ai-sci-8013-fix-protocol-long-name 
Fix protocol long name [SCI-8013]
 2023-02-28 15:21:18 +01:00
sboursen-scinote e6c92fc328 Change only datatable styles related to protocol [SCI-7996] 2023-02-28 14:53:53 +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
Anton cba85eb7fd Fix protoocl long name [SCI-8013] 2023-02-28 12:05:47 +01:00
sboursen-scinote 7d857fbc08 Fix TOC style [SCI-7981] 2023-02-27 21:54:57 +01:00
sboursen-scinote 944e7123be Fix hound [SCI-7996] 2023-02-27 17:15:32 +01:00
sboursen-scinote 65c7a9fa95 Fix the rest of styles [SCI-7996] 2023-02-27 17:10:20 +01:00
sboursen-scinote e02705c3f1 Update actions toolbar styles [SCI-7996] 2023-02-27 16:14:45 +01:00
sboursen-scinote af48cede1f Update protocol repository default view styles [SCI-7996] 2023-02-27 09:58:28 +01:00
aignatov-bio 5ef110d985
Add version modal to protocol show page [SCI-7985] (#5018) 2023-02-24 16:17:36 +01:00
Anton 826cb162da Add save as draft action 2023-02-22 14:59:48 +01:00
Martin Artnik 13ba7c1ea5 Fix for scoll-to elements being hidden behind sticky navigation [SCI-7937] 2023-02-21 15:04:58 +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
sboursen-scinote 97a9cc4fef Align the label and the checkbox [SCI-7745] 2023-02-20 13:16:16 +01:00
artoscinote ac1bf591e2
Merge pull request #4985 from artoscinote/ma_SCI_7946 
Fix RTE image alignments [SCI-7946]
 2023-02-17 14:59:19 +01:00
Martin Artnik fdf03b5c46 Fix RTE image alignments [SCI-7964] 2023-02-17 11:29:43 +01:00
Martin Artnik 43f6a8e66f Fix table of contents, add image download tooltip [SCI-7937] 2023-02-17 10:36: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
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
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
sboursen-scinote 677827d8a3 Center Datatable no item text [SCI-7772] 2023-02-10 17:03:21 +01:00
sboursen-scinote 78f534b5ea Fix the width of the checkbox column in inventory table [SCI-7772] 2023-02-10 14:56:54 +01:00
sboursen-scinote a6eb682234 Fix the spacing for PET tables [SCI-7772] 2023-02-10 14:27:25 +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
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
sboursen-scinote dbb547b3ee Reduce print margin for step [SCI-7237] 2023-02-07 15:43:44 +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
Giga Chubinidze 9e3073b11e step timestamp changes 2023-02-07 15:53:58 +04: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
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
sboursen-scinote a78f113498 Update the style of the form-group with errors [SCI-7831] 2023-02-06 11:31:25 +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 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 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
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
ajugo cb3334e818
Fix datetime in repository advanced filters [SCI-7514] (#4910) 2023-02-01 10:33:36 +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
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
Giga Chubinidze a0a81eee1c My profile page updates of user data [SCI-7627] 2023-01-26 17:01:54 +04:00
Anton 466c25175f Add manage actions to version modal [SCI-7520] 2023-01-26 12:39:11 +01:00
sboursen-scinote adcb0e84f8 Add close button [SCI-7585] 2023-01-26 08:41:33 +01:00
sboursen-scinote ef7395b0cd Adjust the size of the clear button on small screens [SCI-7585] 2023-01-26 08:26:34 +01:00
sboursen-scinote 0896d8bd2e Fix Hound issues [SCI-7562] 2023-01-25 16:54:15 +01:00
sboursen-scinote e2521e501c Change the position of the clear button [SCI-7585] 2023-01-25 11:28:39 +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
sboursen-scinote 9b3140377e Add custom pointer on hover for all dataTables [SCI-7562] 2023-01-23 13:30:28 +01:00
Alex Kriuchykhin 7f3999fa4f
Add protocol published versions modal [SCI-7519] (#4725) 2023-01-20 14:29:25 +01:00
Alex Kriuchykhin 5238a858bd
Fix tags modal in table view for archived tasks [SCI-7743] (#4867) 2023-01-20 10:21:52 +01:00
ajugo d64ccb441e
Fix bullet points and blocks in tinyMCE fields [SCI-7777][SCI-7785] (#4859) 2023-01-19 11:39:14 +01:00
aignatov-bio 8a4599bed1
Merge pull request #4831 from aignatov-bio/ai-sci-7722-fix-new-task-modal-error-handling 
Fix error handling new task modal and completed task duplication [SCI-7722][SCI-7730]
 2023-01-17 13:34:13 +01:00
artoscinote cc4a8bf8be
Merge pull request #4841 from sboursen-scinote/sb_SCI-7737 
Fix: Incorrect icons & double scrollbar displayed when resizing the window [SCI-7737]
 2023-01-17 09:44:12 +01:00
sboursen-scinote 3a185ae416 Remove trailing whitespace from scss file [SCI-7737] 2023-01-16 20:08:18 +01:00
sboursen-scinote 7b489dd59e Display only icons for action buttons in small screens less than 1000px [SCI-7737] 2023-01-16 16:26:37 +01:00
Anton 3eb18a7cf4 Fix error handling new task modal and completed task duplication[SCI-7722][SCI-7730] 2023-01-16 13:03:25 +01:00
Anton e41238a590 Update comments in canvas [SCI-7742] 2023-01-16 12:40:44 +01: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
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
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
Giga Chubinidze 1dc636a49c Manage tags modal improvements [SCI-7724] 2023-01-12 16:01:39 +04:00
Anton a88adbf020 Fix long task names in experiment table [SCI-7708] 2023-01-11 13:37:24 +01:00
artoscinote 0352a2e1d2
Merge pull request #4795 from sboursen-scinote/sb_SCI_7710 
Fix: Cannot clear task due date on experiment table view [SCI_7710]
 2023-01-11 10:03:54 +01:00
sboursen-scinote a7f17524d2 Fix scss style issues 2023-01-10 20:33:25 +01:00
sboursen-scinote 83378e4ade Fix clear due date x button not working 
- Reduce the width of the datetime-picker-container to prevent it from hiding the clear-date (x button).
 2023-01-10 19:45:02 +01:00
Anton ba442babe2 Update tag creation option design [SCI-7698] 2023-01-10 13:07:10 +01:00
aignatov-bio d5bd26a31b
Merge pull request #4787 from aignatov-bio/ai-sci-7540-micro-interactions-fixes 
Micro interactions fixes [SCI-7540]
 2023-01-10 12:12:44 +01:00
Anton b710d15831 Micro interactions fixes [SCI-7540] 2023-01-10 12:08:26 +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
Anton 85eaf7c246 Fix small css issues [SCI-7699][SCI-7694][SCI-7678] 2023-01-09 12:33:59 +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 29c13d8578
Merge pull request #4769 from aignatov-bio/ai-sci-7695-fix-comments-view-mode-experiment-table 
Experiment table - fix comments view mode [SCI-7695]
 2023-01-06 13:10:42 +01:00
aignatov-bio 3282c1104b
Merge pull request #4768 from aignatov-bio/ai-sci-7692-assigned-users-icons-not-alligned 
Fix assigned users icons alignment [SCI-7692]
 2023-01-06 13:10:32 +01:00
Anton 7a7d2c0e1b Experiment table - fix new task modal CSS [SCI-7691] 2023-01-06 13:04:29 +01:00
Anton c513e6bca7 Experiment table - fix comments view mode [SCI-7695] 2023-01-06 12:02:35 +01:00
Anton 7aad22b138 Fix assigned users icons allignment [SCI-7692] 2023-01-06 11:51:32 +01:00
aignatov-bio fe58a7a206
Merge pull request #4766 from aignatov-bio/ai-sci-7699-fix-z-index-for-experiment-table-header 
Fix zIndex for experiment table header [SCI-7699]
 2023-01-06 11:25:10 +01:00
aignatov-bio 7e08c62ce9
Merge pull request #4762 from aignatov-bio/ai-sci-7678-experiment-table-small-css-fixes 
Experiment table small css fixes [SCI-7678]
 2023-01-06 11:24:30 +01:00
Anton 0dd7702786 Fix zIndex for experiment table header [SCI-7699] 2023-01-06 11:18:44 +01:00
Anton f73d2496b8 Experiment table small css fixes [SCI-7678] 2023-01-06 10:54:38 +01:00
artoscinote 9914f19634
Merge pull request #4760 from G-Chubinidze/gc_SCI_7651 
Missing experiment table empty state, fix breadcrumbs [SCI-7651]
 2023-01-06 10:51:34 +01:00
Giga Chubinidze 79c7e6f0a2 Missing experiment table empty state, fix breadcrumbs [SCI-7651] 2023-01-06 11:40:41 +04:00
aignatov-bio 478269d579
Merge pull request #4759 from aignatov-bio/ai-sci-7680-fix-zoom-option-button-icon-color 
Fix color of zoom option button [SCI-7680]
 2023-01-05 17:27:36 +01:00
aignatov-bio d995019efa
Merge pull request #4758 from aignatov-bio/ai-sci-7687-fix-columns-during-sorting 
Fix placeholder columns during sorting [SCI-7687]
 2023-01-05 17:27:26 +01:00
aignatov-bio 78299b64f4
Merge pull request #4756 from aignatov-bio/ai-sci-7646-fix-archived-tasks-logn-experiment-name 
Fix long experiment name on archived tasks card view [SCI-7646]
 2023-01-05 17:27:03 +01:00
Anton 79209054c4 Fix color of zoom option button [SCI-7680] 2023-01-05 13:29:13 +01:00
Anton 00d8e2dd63 Fix placeholder columns during sorting [SCI-7687] 2023-01-05 13:10:51 +01:00
ajugo 32e9329bcc
Fix user assign modal in experiment archived table view [SCI-7654] (#4742) 2023-01-05 12:00:12 +01:00
Anton ca30c6a094 Fix long experiment name on archived tasks card view [SCI-7646] 2023-01-05 11:54:38 +01:00
ajugo 194c519a9b
Fix experiment table due date initialization [SCI-7649] (#4730) 
* Fix experiment table due date initialization [SCI-7649]

* Fix due date overflow [SCI-7649]
 2023-01-05 11:14:34 +01:00
Martin Artnik 4e779e70a4 Merge branch 'develop' into features/tiny_mce_6 2023-01-04 14:21:02 +01:00
Anton ba98075690 Add protocols filters front end [SCI-7517] 2023-01-04 10:34:49 +01:00
aignatov-bio 9522deef52
Merge pull request #4664 from aignatov-bio/ai-sci-7394-update-protocol-io-import-screen 
CSS update for protocol import screen [SCI-7394]
 2023-01-04 10:07:19 +01:00
ajugo 4f55b4a749
Fix advanced filters on PET tables [SCI-7650] (#4747) 2023-01-04 09:59:05 +01:00
ajugo ae55935002
Add missing microinteractions on step editing [SCI-7575] (#4711) 2023-01-03 12:25:22 +01:00
Anton 30606428e9 Fix experiment table title width [SCI-7646] 2022-12-23 10:35:17 +01:00
aignatov-bio ea661f3c19
Merge branch 'develop' into features/new_experiment_views 2022-12-22 13:33:25 +01:00
Martin Artnik 2010ff091c Styling fixes and cleanup [SCI-7574] 2022-12-22 10:37:47 +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
Anton 250a4b4602 CSS fixes for project/experiments cards [SCI-7628] 2022-12-20 12:51:44 +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 2fd2d7300e Revert modified date on experiment card 2022-12-19 11:32:32 +01:00
Anton 66d21e9c4f Fix experiment cards views [SCI-7579] 2022-12-13 13:14:51 +01:00
Anton 6b6105dfe6 CSS fixes for exposed ID [SCI-7586] 2022-12-12 11:45:59 +01:00
aignatov-bio d596746893
Merge pull request #4702 from aignatov-bio/ai-sci-7581-fix-long-protocol-name-in-task-flyout 
Fix long protocol name in task protocol flyout [SCI-7581]
 2022-12-12 11:09:52 +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
Martin Artnik de9f06a1fc Upgrade TinyMCE to 6.3, fix issues [SCI-7574] 2022-12-09 12:52:18 +01:00
Anton de35386f29 Fix long protocol name in task protocol flyout [SCI-7581] 2022-12-09 12:48:37 +01:00
Anton a3045a79a9 Fix expose ids css fixes [SCI-7578] 2022-12-09 09:59:51 +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
Anton 2a8aaed7d1 Add actions toolbar to protocol repository [SCI-7521] 2022-12-06 15:54:50 +01:00
Martin Artnik df4654189b Revert "Revert "Add task IDs to canvas view [SCI-7177][SCI-7178]"" 
This reverts commit 50e7531ffa.
 2022-12-06 12:43:30 +01:00
Anton fdeb22c6cd Update protocols layout [SCI-7515] 2022-12-05 14:02:13 +01: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 756e81c091
Merge pull request #4588 from G-Chubinidze/gc_SCI_7176 
expose experiment ids in active / archived card views [SCI-7176] [SCI-7202]
 2022-12-02 20:16:40 +04: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
Giga Chubinidze eff5d12253 removed last-page class by default 2022-12-02 20:10:03 +04:00
aignatov-bio cd0af24a24
Merge pull request #4676 from aignatov-bio/ai-sci-7525-experiment-table-connect-actions-to-context-menu 
Experiment table connect task action in dropdown [SCI-7525]
 2022-12-02 13:36:01 +01:00
Giga Chubinidze 76884bafc1 code cleanup 2022-12-02 15:53:22 +04:00
Giga Chubinidze 36b99fa2cb code cleanup 2022-12-02 14:51:22 +04: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
Anton 12f141b82e Experiment table connect task action in dropdown [SCI-7525] 2022-12-02 10:03:01 +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
Anton 234c4dfaeb Finish user assignment for experiment table [SCI-7510] 2022-11-30 15:04:02 +01:00
Anton 393bc03d47 CSS update for protocol import screen [SCI-7394] 2022-11-29 15:41:57 +01:00
aignatov-bio 7ea57d9ffe
Merge pull request #4630 from aignatov-bio/ai-sci-7440-add-dropdown-for-assigned-user-experiment-table 
Add user assignments dropdown for experiment table [SCI-7440]
 2022-11-29 15:32:00 +01:00
ajugo ea7f447190
Fix ovelaping checkbox on experiment card view [SCI-7546] (#4663) 2022-11-29 15:08:47 +01:00
aignatov-bio 887b1b062a
Merge pull request #4652 from aignatov-bio/ai-sci-7493-update-archived-my-modules-card-screen 
Update archive module cards header [SCI-7493]
 2022-11-29 14:04:30 +01:00
Anton bd77433fce Add user assignments dropdown for experiment table [SCI-7440] 2022-11-29 13:42:39 +01:00
ajugo 9c88a34d99
Implement empty and loader for canvas view navigator [SCI-7445] (#4651) 2022-11-28 10:35:42 +01:00
Anton e2cd0dfd91 Update archive module cards header [SCI-7493] 2022-11-25 15:29:15 +01: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
aignatov-bio c2be99abda
Merge pull request #4595 from aignatov-bio/ai-sci-7359-fix-select-time-layout 
Fix time picket CSS [SCI-7359]
 2022-11-24 09:44:12 +01:00
artoscinote 5605c3dfed
Merge pull request #4644 from aignatov-bio/ai-sci-7446-experiment-table-task-flyout-menu 
Add menu to experiment table row [SCI-7446]
 2022-11-23 16:48:20 +01:00
Anton 440800537c Add menu to experiment table row [SCI-7446] 2022-11-23 15:05:13 +01:00
Martin Artnik c21152b2e2 Add protocol ID to linked protocol dropdown [SCI-7204] 2022-11-23 11:49:53 +01:00
Anton e940bf8c0e Small canvas edit mode changes [SCI-7387] 2022-11-22 13:08:56 +01:00
Anton 98e87a2f4b Fix markup [SCI-7359] 2022-11-22 11:29:57 +01:00
Alex Kriuchykhin d6728ef9d3
Merge pull request #4597 from rekonder/aj_SCI_7361 
Fixed external protocol icon out of body [SCI-7361]
 2022-11-22 10:56:55 +01: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
Giga Chubinidze 44d74b5797 refactoring projects scss 2022-11-17 22:29:15 +04:00
Giga Chubinidze 7f09fb8997 Archived projects cards and table updates [SCI-7201] 2022-11-17 22:25:54 +04:00
Anton 85c00c61e0 Add table columns display modal to experiment table [SCI-7441] 2022-11-16 09:54:12 +01:00
G-Chubinidze e3b9314646
Update my_modules.scss 2022-11-11 12:48:22 +04: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 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
ajugo dd22d53bda
Implemented pagination for experiment table [SCI-7214] (#4591) 
* Implement pagination for experiment table [SCI-7214]

* Fix table experiment pagination [SCI-7214]

* Move pagination to service [SCI-7214]
 2022-11-07 11:46:54 +01:00
Andrej a88d41ca6a Fixed external protocol icon out of body [SCI-7361] 2022-11-07 11:03:34 +01:00
Anton b3bd165d01 Fix time picket CSS [SCI-7359] 2022-11-04 11:36:21 +01:00
Giga Chubinidze d1aa127b7a Merge branch 'features/exposed_ids' of github.com:scinote-eln/scinote-web into gc_SCI_7176 2022-10-28 15:30:28 +04:00
Giga Chubinidze a9287df1a0 exposed experiment ids on card view page / other styling updates [SCI-7176] 2022-10-28 15:16:49 +04:00
G-Chubinidze 81c5978805
Merge branch 'features/exposed_ids' into gc_SCI_7172 2022-10-28 15:05:38 +04:00
Giga Chubinidze fe488ed00f fixed unstable project name and code styling in cards 2022-10-28 11:38:38 +04:00
Giga Chubinidze b1296adeb3 pitstop 2022-10-28 10:49:13 +04:00
ajugo 29ce28a1af
Implement canvas view navigator [SCI-7198] (#4577) 2022-10-27 14:43:31 +02:00
ajugo bdf56ea2a1
Add comments to the experiment table view [SCI-7217] (#4583) 2022-10-27 14:41:35 +02:00
Anton c2338d677d Fix label preview height in print modal [SCI-7410] 2022-10-27 12:13:25 +02:00
ajugo fedaf703d4
Add view button to experiment title bar [SCI-7216] (#4579) 2022-10-27 09:53:01 +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 ac0fe4389d Fix label preview in print modal [SCI-7367] 2022-10-20 10:57:40 +02:00
ajugo 3a0eec7043
Fix button shrink for inventory toolbar [SCI-7252] (#4551) 2022-10-19 18:09:59 +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
Giga Chubinidze 62febd44dd centered project code for tables 2022-10-13 20:31:37 +04:00
Giga Chubinidze f7472d25b9 more styling fixes 2022-10-07 17:14:43 +04:00