Commit graph

13619 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
de69b1b100 Merge branch 'develop' into features/shareable-links 2023-07-25 09:47:47 +02:00
artoscinote
c3d9488e9f
Fix canvas tag issues [SCI-8917] (#5849) 2023-07-24 17:05:48 +02:00
artoscinote
44c3bc8514
Merge pull request #5848 from artoscinote/ma_SCI_8916
Make locked task tinymce overflow tables scrollable [SCI-8916]
2023-07-24 16:44:37 +02:00
artoscinote
a1d56b5041
Merge pull request #5844 from artoscinote/ma_SCI_8877
Clear wopi file length error on input, css fix [SCI-8877]
2023-07-24 15:30:49 +02:00
Martin Artnik
abd1ef55e5 Make locked task tinymce overflow tables scrollable [SCI-8916] 2023-07-24 15:27:33 +02:00
artoscinote
9cc5f4599a
Merge pull request #5845 from artoscinote/ma_SCI_8915
Fix incorrect icons [SCI-8915]
2023-07-24 14:21:15 +02:00
Martin Artnik
91153b156a Fix incorrect icons [SCI-8915] 2023-07-24 14:18:24 +02:00
artoscinote
f769ca24c4
Merge pull request #5842 from G-Chubinidze/gc_SCI_8906
Replace old icons with new ones [SCI-8906]
2023-07-24 14:17:20 +02:00
Giga Chubinidze
fb6fa51e5c add last space 2023-07-24 16:06:10 +04:00
Giga Chubinidze
547c0f6082 fixed icons 2023-07-24 16:05:07 +04:00
Martin Artnik
ebfaca6966 Clear wopi file length error on input, css fix [SCI-8877] 2023-07-24 12:46:45 +02:00
artoscinote
ff83b97d7b
Merge pull request #5841 from artoscinote/ma_SCI_8894
Fix tinymce loading placeholders for text elements [SCI-8894]
2023-07-24 10:39:14 +02:00
Giga Chubinidze
d236cc9803 Replace old icons with new ones [SCI-8906] 2023-07-24 11:56:23 +04:00
Soufiane
5a44400fbb
Fix zebra printer CSP issue [SCI-8859] (#5806) 2023-07-21 16:54:57 +02:00
Alex Kriuchykhin
9d336423ab
Fix projects exports with tables [SCI-8827] (#5840) 2023-07-21 16:44:03 +02:00
Martin Artnik
30e07ff1e9 Fix tinymce loading placeholders for text elements [SCI-8894] 2023-07-21 16:25:44 +02:00
Alex Kriuchykhin
f735c917af
Update Rails to 7.0.5.1 (#5839) 2023-07-21 14:15:40 +02:00
wandji
e7ab30fbd5
Update project link in template protocol linked experiments modal [SCI-8913] (#5837) 2023-07-21 14:10:59 +02:00
wandji
54877c2c1c
Fix UI issues in addons page [SCI-8896] (#5835)
* Fix UI issues in addons page [SCI-8896]

* Fix linter error [SCI-8896]
2023-07-21 14:08:06 +02:00
Alex Kriuchykhin
2489084566
Fix handling of responses in WOPI controller [SCI-8856] (#5838) 2023-07-21 13:25:36 +02:00
artoscinote
7d62a805a3
Upgrade roo to work with Ruby 3, fix rendering of import modal [SCI-8903] (#5836) 2023-07-21 12:48:32 +02:00
ajugo
abda07bf4e
Merge pull request #5832 from sboursen-scinote/sb_SCI-8909
Fix manage modal issues [SCI-8909]
2023-07-21 12:13:36 +02:00
aignatov-bio
160bc270b6
Merge pull request #5834 from aignatov-bio/ai-sci-8912-fix-characters-escaping
Fix escape issues [SCI-8912]
2023-07-21 11:53:27 +02:00
Alex Kriuchykhin
7cb8feefb9
Fix permission checking in WOPI controller [SCI-8856] (#5833) 2023-07-21 11:53:10 +02:00
Anton
5394fee3db Fix escape issues [SCI-8912] 2023-07-21 11:48:19 +02:00
aignatov-bio
cca978dc5a
Merge pull request #5824 from aignatov-bio/ai-sci-8890-fix-navigator-render-for-active-folders
Fix navigator render for active folder with archived elements [SCI-8890]
2023-07-21 10:36:35 +02:00
artoscinote
a88e66e12b
Merge pull request #5823 from artoscinote/ma_SCI_8733
Preserve column widths when showing/hiding columns [SCI-8733]
2023-07-21 10:33:58 +02:00
sboursen-scinote
e58a12da52 Fix manage modal issues [SCI-8909] 2023-07-21 09:36:10 +02:00
Alex Kriuchykhin
8aa06bf4af
Fix generation of docx report, fix rendering of modals [SCI-8911] (#5831) 2023-07-20 16:46:16 +02:00
ajugo
962400b952
Merge pull request #5828 from sboursen-scinote/sb_SCI-8827
Projects - Issues after rails upgrade [SCI-8827]
2023-07-20 16:44:36 +02:00
sboursen-scinote
be0648bfe9 Merge branch 'develop' into sb_SCI-8827 2023-07-20 14:18:00 +02:00
sboursen-scinote
97744e2ed5 Fix rendering of json handson tables metadata in results during project export [SCI-8827] 2023-07-20 14:06:03 +02:00
Alex Kriuchykhin
31880521ef
Fix displaying of file previews, refactor file analyzer [SCI-8892] (#5818) 2023-07-20 12:59:45 +02:00
ajugo
c4d6fc55af
Fix marvinjs file preview in RTF [SCI-8904] (#5819) 2023-07-20 11:26:58 +02:00
Soufiane
c12023f8aa
Remove user_team model and related code [SCI-8815] (#5815) 2023-07-20 10:57:29 +02:00
dependabot[bot]
8039908642
Bump word-wrap from 1.2.3 to 1.2.4 (#5825)
Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-07-20 10:53:32 +02:00
artoscinote
b0f45713cf
Merge pull request #5826 from G-Chubinidze/gc_SCI_8820
Error at inviting user to SciNote [SCI-8820]
2023-07-20 10:47:19 +02:00
Giga Chubinidze
4645489527 fixed teams for dropdown 2023-07-20 12:46:31 +04:00
Giga Chubinidze
ea67f543f2 removed unnecessary code 2023-07-20 12:27:56 +04:00
Anton
0c5d9eb23b Fix navigator render for active folder with archived elements [SCI-8890] 2023-07-20 10:18:05 +02:00
ajugo
528bdc554c
Merge pull request #5821 from rekonder/aj_SCI_8834
Fix nil object rendering for position [SCI-8834]
2023-07-20 09:58:30 +02:00
ajugo
12062c2c57
Merge pull request #5822 from rekonder/merge_cleanup
Fix shareable links after develop merge
2023-07-20 09:49:51 +02:00
Martin Artnik
c38d58336a Preserve column widths when showing/hiding columns [SCI-8733] 2023-07-20 09:49:29 +02:00
Andrej
37d8ac6cd6 Fix shareable links after develop merge 2023-07-20 09:39:17 +02:00
Andrej
ab0d961cc1 Fix nil object rendering for position [SCI-8834] 2023-07-20 08:48:13 +02:00
ajugo
cc0520fe4b
Merge pull request #5814 from rekonder/aj_SCI_8887
Fix opening tabs on tasks for archived tasks [SCI-8887]
2023-07-19 16:24:40 +02:00
G-Chubinidze
b0c36452b7
Fix export action on project card dropdown [SCI-8833] (#5772)
* Fix export action on project card dropdown [SCI-8833]
2023-07-19 16:05:17 +02:00
aignatov-bio
6759ded57f
Merge pull request #5817 from aignatov-bio/ai-sci-8902-fix-edit-file-result
Fix edit file result [SCI-8902]
2023-07-19 15:01:02 +02:00
ajugo
6f77f0a055
Merge pull request #5816 from rekonder/aj_SCI_8863
Change font for error input errors [SCI-8863]
2023-07-19 15:00:32 +02:00
Anton
b0b8427f53 Fix edit file result [SCI-8902] 2023-07-19 14:56:29 +02:00