Commit graph

1224 commits

Author SHA1 Message Date
Anton
d6ab6e15f8 Fix office creation on results [SCI-9260] 2023-09-13 14:30:00 +02:00
Anton
718013439d Fix checklist rearrange [SCI-9271] 2023-09-13 14:13:34 +02:00
Anton
3268a95ecf Fix text field width and table header [SCI-9149] 2023-09-13 14:03:49 +02:00
aignatov-bio
ef3c916c00
Merge pull request #6205 from aignatov-bio/ai-sci-9262-add-three-dots-menu-for-elements
Add flyout menu to step/results elements [SCI-9262]
2023-09-13 13:49:33 +02:00
Anton
3bee8feb7d Add flyout menu to step/results elements [SCI-9262] 2023-09-13 12:12:36 +02:00
Martin Artnik
6a8f8cb419
Merge pull request #6194 from artoscinote/ma_SCI_9279
Fix z-index issues with share modal [SCI-9279]
2023-09-13 10:11:38 +02:00
Martin Artnik
c5eb1759b6
Merge pull request #6198 from artoscinote/ma_SCI_9285
Fix result pagination, fix new step/result buttons [SCI-9285]
2023-09-13 10:00:01 +02:00
aignatov-bio
637093f69e
Merge pull request #6188 from aignatov-bio/ai-sci-9254-fix-inline-edit
Fix inline edit [SCI-9254]
2023-09-13 09:59:50 +02:00
Martin Artnik
6114dd7afc Fix result pagination, fix new step/result buttons [SCI-9285] 2023-09-12 17:33:47 +02:00
Martin Artnik
b78ed02bf4 Fix z-index issues with share modal [SCI-9279] 2023-09-12 14:11:34 +02:00
G-Chubinidze
067d0ca51e
Merge branch 'features/september-release' into gc_SCI_9105 2023-09-12 02:19:02 +04:00
Giga Chubinidze
46af9af0a9 Implement results expand/collapse, and expand/collapse all [SCI-9105] 2023-09-12 02:11:58 +04:00
Anton
982da48bbe Fix inline edit vue component [SCI-9254] 2023-09-11 17:15:00 +02:00
Anton
67c6d66ff1 Fixing inline edit [SCI-9254] 2023-09-11 15:58:53 +02:00
aignatov-bio
daa708a840
Merge pull request #6183 from aignatov-bio/ai-sci-fix-css-task-results
CSS fixed for task protocol
2023-09-11 15:57:36 +02:00
Anton
3f12f91b4a CSS fixed for task protocol 2023-09-11 12:19:21 +02:00
Martin Artnik
8c3ff1813a
Merge pull request #6177 from artoscinote/ma_SCI_9267
Fix attachment sorting in results [SCI-9267]
2023-09-11 10:01:26 +02:00
Martin Artnik
266c78deb1
Merge pull request #6179 from artoscinote/ma_SCI_9278
Disable move button in move content modal if there's no target selected [SCI-9278]
2023-09-11 09:59:47 +02:00
wandji
a3dd30d218
Load OVE packages via yarn [SCI-9231] (#6176)
* Add OVE yarn package and load assets from node_modules [SCI-9231]

* Move hardcoded text to i18 [SCI-9231]
2023-09-11 09:50:05 +02:00
Martin Artnik
f0c77b4e7d Disable move button in move content modal if there's no target selected [SCI-9278] 2023-09-08 16:26:29 +02:00
Martin Artnik
ede9e40be8 Fix attachment sorting in results [SCI-9267] 2023-09-08 16:07:43 +02:00
Anton
7b44a47d51 Add active/archive switch to results page [SCI-9264] 2023-09-08 13:42:02 +02:00
Gregor Lasnibat
5ad6b27f9c
Merge pull request #6169 from lasniscinote/gl_SCI_9256
Fix styles for input in OVE/Marvin editor [SCI-9256]
2023-09-08 10:19:59 +02:00
wandji
8e4dbbac58
Remove name when loading ove file [SCI-9169] (#6165) 2023-09-07 17:19:09 +02:00
Gregor Lasnibat
93a1c842d9 Fix styles for input in OVE/Marvin editor [SCI-9256] 2023-09-07 15:42:37 +02:00
aignatov-bio
92749d5ec2
Merge branch 'features/september-release' into ai-sci-9210-add-move-action-to-asset-card 2023-09-07 14:15:17 +02:00
Anton
53d08fe09d Fix permissions on results [SCI-9253] 2023-09-07 12:12:30 +02:00
Anton
8f9072f46e Fix navigator CSS [SCI-9230][SCI-9233] 2023-09-07 10:45:50 +02:00
Martin Artnik
70bdb870b5
Merge pull request #6124 from artoscinote/ma_SCI_9209
Fix attachment deletion and image errors [SCI-9209]
2023-09-07 10:37:41 +02:00
Anton
7af03bd651 Add move action to asset thumbnail [SCI-9210] 2023-09-07 10:33:33 +02:00
Anton
1247406055 Add archive view to results [SCI-9223] 2023-09-06 15:06:27 +02:00
Martin Artnik
1e49cc5608
Merge pull request #6149 from G-Chubinidze/gc_SCI_9187
Implement type-to-search functionality in the "Move to different results" modal [SCI-9187]
2023-09-06 14:31:05 +02:00
Giga Chubinidze
76b7c45021 Implement type-to-search functionality in the 'Move to different result' modal [SCI-9187] 2023-09-06 16:12:31 +04:00
Gregor Lasnibat
c030d2b6d1 Fix missing paperclip icon for file attachment [SCI-9224] 2023-09-06 13:52:03 +02:00
Gregor Lasnibat
f172c97a79 Fix missing OVE file preview [SCI-9214] 2023-09-06 12:45:42 +02:00
aignatov-bio
b5883178a4
Merge pull request #6123 from ivanscinote/SCI-9016-inline-edit-component-ui-rework
Rework inline edit vue component UI [SCI-9016]
2023-09-06 10:49:18 +02:00
Anton
48b89fc699 Fix activities for results [SCI-9206][SCI-9205][SCI-9207] 2023-09-05 16:25:21 +02:00
Martin Artnik
94932d0b04 Fix attachment deletion and image errors [SCI-9209] 2023-09-05 14:43:16 +02:00
aignatov-bio
7a32703c1a
Merge branch 'features/september-release' into ai-sci-9088-add-attachments-move-ability 2023-09-05 14:41:23 +02:00
aignatov-bio
647fb76910
Merge branch 'features/september-release' into ai-sci-9108-add-infinite-scroll 2023-09-05 14:40:03 +02:00
aignatov-bio
c33243b962
Merge pull request #6126 from aignatov-bio/ai-sci-9141-add-title-to-tinymce-fields
Add title to text component [SCI-9141]
2023-09-05 14:32:42 +02:00
aignatov-bio
c3a5bf2e37
Merge pull request #6136 from aignatov-bio/ai-sci-9195-fix-tinymce-sticky-header
Fix tinymce header [SCI-9195]
2023-09-05 14:31:20 +02:00
Ivan Kljun
a6abfc7e31 Applying hound suggestions [SCI-9016] 2023-09-05 13:39:21 +02:00
Anton
b4659e88a9 Fix tinymce header [SCI-9195] 2023-09-05 12:06:48 +02:00
Ivan Kljun
86e2cfe747 Merge remote-tracking branch 'upstream/features/september-release' into SCI-9016-inline-edit-component-ui-rework 2023-09-05 11:31:30 +02:00
artoscinote
8d352b758a
Merge pull request #6133 from ivanscinote/SCI-9182-rearranging-content-within-a-result-modal-translation
Use act_as_list for reordering result elements, localize title for result reordering modal [SCI-9182]
2023-09-05 11:09:08 +02:00
Ivan Kljun
56744e2dcd Use act_as_list for reordering result elements, localize title for result reordering modal [SCI-9182] 2023-09-05 11:02:39 +02:00
artoscinote
c59ee1c358
Merge pull request #6132 from G-Chubinidze/gc_SCI_9179
Archiving results doesn't work [SCI-9179]
2023-09-05 10:53:43 +02:00
Giga Chubinidze
b7da98c1dd Archiving results doesn't work [SCI-9179] 2023-09-05 11:55:15 +04:00
Anton
86f413cc71 Add title to text component [SCI-9141] 2023-09-04 14:13:29 +02:00
Giga Chubinidze
3b8669ed84 Add timestamps to results [SCI-9181] 2023-09-04 11:40:32 +04:00
Gregor Lasnibat
b382bb441e Fix save empty OVE [SCI-9193] 2023-09-02 06:44:30 +02:00
lasniscinote
178d46dfae
Merge pull request #6134 from lasniscinote/gl_SCI_9213
Fix gene sequence attachment icons [SCI-9213]
2023-09-05 12:58:19 +02:00
Alex Kriuchykhin
f0fe040932
Fix OVE asset preview reloading after update [SCI-9112] (#6122) 2023-09-05 11:36:37 +02:00
Gregor Lasnibat
589faef72f Fix gene sequence attachment icons [SCI-9213] 2023-09-02 03:14:51 +02:00
Ivan Kljun
40638dbb63 Rework inline edit vue component UI [SCI-9016] 2023-09-01 17:18:13 +02:00
wandji
c46c2ee9d6
Detach the File name changes from changing filename inside the OVE [SCI-9169] (#6116) 2023-09-01 13:54:41 +02:00
artoscinote
dc535bce52
Merge pull request #6121 from G-Chubinidze/gc_SCI_9186
Button translation in the "Move to different result" Modal [sci-9186]
2023-09-01 11:40:57 +02:00
artoscinote
7b73e03a5f
Merge pull request #6120 from G-Chubinidze/gc_SCI_9185
Placeholder text in the "Move to different result" modal dropdown [SCI-9185]
2023-09-01 11:40:34 +02:00
Giga Chubinidze
b71323d720 changed object mutation/changed placeholder check 2023-09-01 13:37:48 +04:00
artoscinote
51227b5c65
Merge pull request #6119 from G-Chubinidze/gc_SCI_9081
Placeholder text (titles, description field) [SCI-9081]
2023-09-01 11:02:06 +02:00
Martin Artnik
3724a4a067 Merge branch 'develop' into features/september-release 2023-09-01 10:30:48 +02:00
wandji
bed7f574f0
Hide align toolbar option in OVE editor [SCI-9113] (#6113)
* Hide align toolbar option in OVE editor [SCI-9113]

* Hide alligment toolbar in OVE editor [SCI-9113]
2023-09-01 10:18:36 +02:00
Giga Chubinidze
6db9134065 Button translation in the "Move to different result" Modal 2023-09-01 11:59:56 +04:00
Giga Chubinidze
100fdde5ca Placeholder text in the "Move to different result" modal dropdown 2023-09-01 11:49:43 +04:00
Anton
d2ffaa209c Fix results CSS [SCI-9177] 2023-08-31 15:53:38 +02:00
Oleksii Kriuchykhin
b4eb4d38e6 Merge branch 'develop' into features/ove-integration 2023-08-31 15:52:38 +02:00
wandji
167abe5239
Add .json extension to OVE import tooltip [SCI-9116] (#6112)
* Add .json extension to OVE import tooltip [SCI-9116]

* Override import and downlod tooltip values [SCI-9116]
2023-08-31 12:51:49 +02:00
Anton
2d76e628be Add infinite scroll to results [SCI-9108] 2023-08-30 15:51:23 +02:00
G-Chubinidze
7a1b1b5cf5
UI rework of thumbnail view asset controls [SCI-9015] (#6104)
* UI rework of thumbnail view asset controls [SCI-9015]

* styling change css -> tailwind
2023-08-30 15:42:55 +02:00
Martin Artnik
c6e8bc1d2a Fix TinyMCE sticky header calculation [SCI-9184] 2023-08-30 13:28:36 +02:00
aignatov-bio
f5235a9b9d
Merge pull request #6097 from aignatov-bio/ai-sci-8980-scrolling-on-task-page
Add sticky scrolling to task page [SCI-8980]
2023-08-30 11:54:28 +02:00
Anton
6a287fa54f Add sticky scrolling to task page [SCI-8980] 2023-08-30 11:09:27 +02:00
artoscinote
ffb8c7c455
Merge pull request #6100 from scinote-eln/hotfix/1.28.0.2
Hotfix/1.28.0.2
2023-08-29 16:31:04 +02:00
aignatov-bio
e8f839d719
Merge pull request #6088 from aignatov-bio/ai-sci-8977-ui-revamp-filters-modal
Revamp filters flyouts [SCI-8977]
2023-08-29 10:18:54 +02:00
Anton
eb44724ece Fix marving JS button initialization [SCI-9144] 2023-08-28 15:53:58 +02:00
Anton
171a996aec Revamp filters flyouts [SCI-8977] 2023-08-28 13:15:41 +02:00
G-Chubinidze
bbffce5e03
Placeholder text (titles, description field) [SCI-9081] (#6087)
* Placeholder text (titles, description field) [SCI-9081]

* removed serializer code

* Update table.vue
2023-08-28 10:36:40 +02:00
Giga Chubinidze
0e2f9ff81d removed serializer code 2023-08-28 12:14:44 +04:00
Giga Chubinidze
6d8d804c71 Placeholder text (titles, description field) [SCI-9081] 2023-08-28 10:32:08 +04:00
ajugo
db4aa53f72
Merge pull request #5993 from sboursen-scinote/sb_SCI-9038
Set sequence attachments file icon [SCI-9038]
2023-08-25 21:53:22 +02:00
Anton
6615c01cb4 Add input field with search history [SCI-9102] 2023-08-25 15:02:27 +02:00
Soufiane
a19ab3b519
Fix OVE CSS issues [SCI-9114] (#6081)
- Fix broken CSS import.
- Hide body scroll when editor is open.
- Fix editor header design.
2023-08-25 14:22:37 +02:00
sboursen-scinote
195df7936f Use custom images for marvin and OVE [SCI-9038] 2023-08-25 13:59:18 +02:00
wandji
61da3a12b9
Add menubar to ove editor [SCI-9115] (#6079)
* Add menubar to ove editor [SCI-9115]
2023-08-25 11:36:33 +02:00
Anton
e66968357a Fix hound 2023-08-25 09:46:53 +02:00
Anton
f31d2b8912 Add move ability to attachments [SCI-9088] 2023-08-24 15:57:03 +02:00
Martin Artnik
dfa2afa480 Fix sticky tinyMCE menu offset [SCI-9131] 2023-08-24 14:21:30 +02:00
ivanscinote
059530620b
Implement delegated event handling for rel='external' [SCI-8737] (#6050)
* Replace tinymce target='_blank' with rel='external' [SCI-8737]

* Add noopener to rel='external' links
2023-08-24 11:12:11 +02:00
Soufiane
9d0f62824e
Remove blinking button from actiontoolbar when loading [SCI-9067] (#6062) 2023-08-24 09:19:35 +02:00
ajugo
253be93368
Fix loading of navigators [SCI-8797] (#5868) 2023-08-23 15:49:00 +02:00
artoscinote
0bea4a06ef
Add result duplicate action [SCI-8959] (#6019) 2023-08-23 15:05:31 +02:00
Ivan Kljun
39ed4b1b92 Hide Cancel/Save btns after click at Share task modal [SCI-9008] 2023-08-23 14:20:24 +02:00
artoscinote
e1416e3efd
Merge branch 'features/september-release' into ma_SCI_9013 2023-08-23 12:01:14 +02:00
Martin Artnik
b3965e5aca Implement result filters [SCI-9013] 2023-08-23 11:59:21 +02:00
artoscinote
e03920affd
Merge branch 'develop' into ma_SCI_8462 2023-08-23 11:21:32 +02:00
Anton
beed1cdb9d Make top navigation and breadcrumbs collapsable [SCI-9090] 2023-08-22 16:24:34 +02:00
ivanscinote
c8bc4bef01
Refactor new tab opening mechanism and update link options in TinyMCE v6 [SCI-8737] (#5866)
Refactor new tab opening mechanism and update link options in TinyMCE v6 [SCI-8737]
2023-08-22 14:59:34 +02:00
aignatov-bio
c111d287ef
Merge pull request #6039 from aignatov-bio/ai-sci-9024-add-move-modal-for-elements
Add element movements between step and results [SCI-9024]
2023-08-22 12:26:57 +02:00
Anton
e9174ad158 Add element movements between step [SCI-9024] 2023-08-22 12:15:55 +02:00