Commit graph

11981 commits

Author SHA1 Message Date
Giga Chubinidze
0a1b879c3d exposed prefixed ids for projects table [SCI_7172] 2022-09-13 15:49:12 +04:00
artoscinote
b36a91ef85
Merge pull request #4432 from scinote-eln/develop
September cleanup, version 1.26.0.4
2022-09-13 13:37:57 +02:00
artoscinote
e8add30225
Bump version to
1.26.0.4
2022-09-13 13:24:43 +02:00
Martin Artnik
3d1bdac1f4 Added task code to task details [SCI-7178] 2022-09-13 13:17:18 +02:00
Martin Artnik
b836b9a12b Add task IDs to canvas view [SCI-7177] 2022-09-13 12:42:12 +02:00
Anton
d68bb6ddf4 Fix dupicate protocols in activities search [SCI-7171] 2022-09-13 12:38:26 +02:00
Giga Chubinidze
2c393a1bef exposed prefixed ids for projects table [SCI_7172] 2022-09-13 13:31:04 +04:00
Giga Chubinidze
fbbe394029 exposed prefixed ids for projects table [SCI_7172] 2022-09-13 13:24:06 +04:00
Anton
7d02b9f26d Fix repository selection in reports [SCI-7167] 2022-09-13 09:59:11 +02:00
aignatov-bio
06548c247f
Merge pull request #4407 from aignatov-bio/ai-sci-7148-make-zebra-printers-switchable
Add ability to disable zebra printers [SCI-7148]
2022-09-12 13:54:52 +02:00
aignatov-bio
4a0135aaee
Merge pull request #4425 from aignatov-bio/ai-sci-7182-fix-tinymce-errors
Fix tinymce errors [SCI-7182]
2022-09-12 13:54:43 +02:00
Martin Artnik
2e3956aaf9 Skip previews for non-supported images in team zip export [SCI-7163] 2022-09-12 12:31:17 +02:00
Giga Chubinidze
271867710f added scrollbar to task paper dropdown [SCI-7115] 2022-09-09 23:28:37 +04:00
Alex Kriuchykhin
f62e4e8509
Merge pull request #4423 from okriuchykhin/ok_SCI_7180
Improve speed of group unassignment job as it is executed in foreground [SCI-7180]
2022-09-09 15:58:44 +02:00
Anton
73917ec4c0 Fix tinymce errors [SCI-7182] 2022-09-09 15:50:59 +02:00
Oleksii Kriuchykhin
b8dc0617b2 Improve speed of group unassignment job as it is executed in foreground [SCI-7180] 2022-09-09 13:31:16 +02:00
artoscinote
fa7e39c6a9
Fix experiment page infinite scroll [SCI-7160] (#4422) 2022-09-09 11:42:37 +02:00
artoscinote
6a2037dc00
Fix smart annotations in locked elements [SCI-7135] (#4421) 2022-09-09 11:15:33 +02:00
Alex Kriuchykhin
c0d3d04747
Merge pull request #4417 from okriuchykhin/ok_SCI_7151
Reimplement custom TinyMCE plugin: customImageUploader [SCI-7151]
2022-09-09 11:00:55 +02:00
Oleksii Kriuchykhin
557c4b205a Reimplement custom TinyMCE plugin: customImageUploader [SCI-7151] 2022-09-09 10:59:20 +02:00
Oleksii Kriuchykhin
d5205843f4 Enable Fluics sync only if env variable is present [SCI-7047] 2022-09-08 17:22:29 +02:00
Alex Kriuchykhin
b5d60499d5
Merge pull request #4373 from okriuchykhin/ok_SCI_7086
Add activities for label template actions [SCI-7086]
2022-09-08 16:41:14 +02:00
Oleksii Kriuchykhin
bb6e638528 Add activities for label template actions [SCI-7086] 2022-09-08 16:35:53 +02:00
aignatov-bio
08a22cdd47
Merge pull request #4420 from aignatov-bio/ai-sci-7183-fix-tinymce-pack-code-styling
Fix tinymce pack code styling [SCI-7183]
2022-09-08 15:38:26 +02:00
Anton
9b52b7f3db Fix tinymce pack code styling [SCI-7183] 2022-09-08 15:37:23 +02:00
aignatov-bio
8455742596
Merge pull request #4416 from aignatov-bio/ai-sci-7152-update-tinymce-image-toolbar-plugin
Update tinymce image toolbar plugin [SCI-7152]
2022-09-08 12:14:06 +02:00
aignatov-bio
7d9fbb45d5
Merge branch 'features/tiny_mce_6' into ai-sci-7152-update-tinymce-image-toolbar-plugin 2022-09-08 12:13:58 +02:00
aignatov-bio
2fadd67e33
Merge pull request #4418 from aignatov-bio/ai-sci-7153-update-tinymce-placeholder-plugin
Update tinymce placeholder plugin [SCI-7153]
2022-09-08 12:12:05 +02:00
G-Chubinidze
e179182d21
fix archived repositories show button not showing [SCI-7162] (#4408)
* fix archived repositories show button not showing [SCI-7162]

* fix archived repositories show button not showing [SCI-7162]

Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
2022-09-08 11:51:47 +02:00
Anton
2f01a5a358 Update tinymce placeholder plugin [SCI-7153] 2022-09-07 15:16:03 +02:00
Anton
c8af3e1fa8 Update tinymce image toolbar plugin [SCI-7152] 2022-09-07 11:24:54 +02:00
Alex Kriuchykhin
c5f0fa3e7f
Merge pull request #4415 from okriuchykhin/ok_SCI_7164
Do not change team if inventory is shared with current one [SCI-7164]
2022-09-07 11:06:51 +02:00
Oleksii Kriuchykhin
3d3fa6e871 Do not change team if inventory is shared with current one [SCI-7164] 2022-09-07 11:01:53 +02:00
artoscinote
95105b86af
Fix ininite scroll [SCI-7160] (#4414) 2022-09-07 10:01:00 +02:00
aignatov-bio
eda4f48d60
Merge pull request #4413 from aignatov-bio/ai-sci-7154-update-tinymce-marvinjs-plugin
Update tinyMCE marvinjs plugin [SCI-7154]
2022-09-06 13:11:48 +02:00
Anton
1ebd4046cd Update tinyMCE marvinjs plugin [SCI-7154] 2022-09-06 13:05:56 +02:00
aignatov-bio
2407b95e37
Merge pull request #4411 from aignatov-bio/ai-sci-7169-remove-scroll-before-page-leave
Remove scroll before page leave [SCI-7169]
2022-09-06 12:44:20 +02:00
artoscinote
d2b022a17d
Remove obsolete code [SCI-7160] (#4412) 2022-09-06 12:10:20 +02:00
artoscinote
21f91089e9
Prevent loading empty next page in P/E infinite scroll [SCI-7160] (#4410) 2022-09-06 11:57:34 +02:00
Anton
90e962ccbf Remove scroll before page leave [SCI-7169] 2022-09-06 11:15:28 +02:00
artoscinote
9126b7fca4
Add missing protocol description activity [SCI-7140] (#4401) 2022-09-06 11:03:13 +02:00
Alex Kriuchykhin
8a0656ce21
Merge pull request #4147 from okriuchykhin/ok_SCI_6834
Update tests with new team user assignments [SCI-6843]
2022-09-05 14:34:16 +02:00
Anton
47e20d1b27 Add ability to disable zebra printers [SCI-7148] 2022-09-05 12:37:03 +02:00
aignatov-bio
b585219be2
Merge pull request #4402 from aignatov-bio/ai-sci-7127-fix-error-handling-for-tinymce
Fix error handling for tinymce [SCI-7127]
2022-09-05 12:36:36 +02:00
artoscinote
44b7c866b5
Move tinymce to webpacker and upgrade to v6 [SCI-7081] (#4385)
* Move tinymce to webpacker and upgrade to v6 [SCI-7081]

* Cleanup and refactor [SCI-7081]

* Clean up legacy plugins [SCI-7150]

* Linter fix [SCI-7081]]
2022-09-05 11:29:19 +02:00
Alex Kriuchykhin
bf7582fe1d
Merge pull request #4406 from okriuchykhin/ok_SCI_7158
Make experiment card dropdown menu async [SCI-7158]
2022-09-02 18:16:07 +02:00
Oleksii Kriuchykhin
f85a6b5a2e Make experiment card dropdown menu async [SCI-7158] 2022-09-02 18:15:01 +02:00
Alex Kriuchykhin
d5a3b622c6
Merge pull request #4405 from okriuchykhin/ok_SCI_7157
Make permission checks for card selection async [SCI-7157]
2022-09-02 18:13:39 +02:00
Oleksii Kriuchykhin
e27d063b61 Make permission checks for card selection async [SCI-7157] 2022-09-02 18:10:16 +02:00
Alex Kriuchykhin
0fcedc32ba
Merge pull request #4403 from artoscinote/ma_SCI_7159
Make project action dropdowns async [SCI-7159]
2022-09-02 17:05:35 +02:00