Commit graph

14472 commits

Author SHA1 Message Date
aignatov-bio
678e40f04d
Merge pull request #6075 from aignatov-bio/ai-sci-9088-add-attachments-move-ability
Add move ability to attachments [SCI-9088]
2023-09-05 14:41:29 +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
7856253529
Merge pull request #6110 from aignatov-bio/ai-sci-9108-add-infinite-scroll
Add infinite scroll to results [SCI-9108]
2023-09-05 14:40:11 +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
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
Oleksii Kriuchykhin
2c816cf463 Merge branch 'release/1.28.0' into develop 2023-09-05 12:54:37 +02:00
Alex Kriuchykhin
5928f708e1
Remove user controlled method execution from connected_accounts controller, add Okta unlinking functionality [SCI-9220] (#6135) 2023-09-05 12:53:51 +02:00
Anton
b4659e88a9 Fix tinymce header [SCI-9195] 2023-09-05 12:06:48 +02:00
Alex Kriuchykhin
f0fe040932
Fix OVE asset preview reloading after update [SCI-9112] (#6122) 2023-09-05 11:36:37 +02:00
Alex Kriuchykhin
90cd330126
Fix removing user from public projects [SCI-9174] (#6130) 2023-09-05 11:36:26 +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
G-Chubinidze
ff7743b7e8
Update routes.rb 2023-09-05 11:57:47 +04:00
Giga Chubinidze
b7da98c1dd Archiving results doesn't work [SCI-9179] 2023-09-05 11:55:15 +04:00
artoscinote
f6fa05520b
Merge pull request #6131 from scinote-eln/revert-6128-ma_SCI_9217
Revert "Don't display icons in fields with errors (alignment issues) [SCI-9217]"
2023-09-05 09:21:52 +02:00
artoscinote
cdfe9aaa0c
Revert "Don't display icons in fields with errors (alignment issues) [SCI-9217]" 2023-09-05 09:21:40 +02:00
Oleksii Kriuchykhin
7b40b43922 Merge branch 'release/1.28.0' into develop 2023-09-04 16:01:46 +02:00
Alex Kriuchykhin
df290ad3b3
Improve parameter filtering in activities filters and smart annotations [SCI-9218] (#6129) 2023-09-04 15:56:17 +02:00
artoscinote
322b38933c
Merge pull request #6127 from ivanscinote/SCI-9111-experiment-table-view-does-not-load
Fix my_module_results_path and add id to experiments/tablejs tag [SCI-9111]
2023-09-04 15:20:51 +02:00
artoscinote
6ad1b6b67e
Merge pull request #6128 from artoscinote/ma_SCI_9217
Don't display icons in fields with errors (alignment issues) [SCI-9217]
2023-09-04 15:19:25 +02:00
Martin Artnik
cc29ca4cce Don't display icons in fields with errors (alignment issues) [SCI-9217] 2023-09-04 15:17:22 +02:00
Ivan Kljun
54a8552901 Fix my_module_results_path and add id to experiments/tablejs tag [SCI-911] 2023-09-04 14:23:55 +02:00
Anton
86f413cc71 Add title to text component [SCI-9141] 2023-09-04 14:13:29 +02:00
artoscinote
6bf0c6cb2f
Merge pull request #6125 from G-Chubinidze/gc_SCI_9181
Add timestamps to results [SCI-9181]
2023-09-04 10:36:24 +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
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
Martin Artnik
cb023cd9c8 Add back status_flow.scss, deleted by accident 2023-09-01 13:59:58 +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
Giga Chubinidze
793ab0eb99 Placeholder text (titles, description field) [SCI-9081] 2023-09-01 10:58:00 +04:00
artoscinote
19026b936d
Merge pull request #6117 from artoscinote/ma_SCI_9180
Fix result assets when duplicating [SCI-9180]
2023-08-31 16:00:50 +02:00
aignatov-bio
def8da1aac
Merge pull request #6118 from aignatov-bio/ai-sci-9177-add-css-to-results-page
Fix results CSS [SCI-9177][SCI-9176]
2023-08-31 15:59:54 +02: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
Martin Artnik
65e55acc06 Fix result assets when duplicating [SCI-9180] 2023-08-31 15:38:56 +02:00
Oleksii Kriuchykhin
7781ee8695 Bump version to 1.28.1.2 2023-08-31 13:47:39 +02:00