Commit graph

14914 commits

Author SHA1 Message Date
Martin Artnik
9fbbb185e0
Merge pull request #6550 from sboursen-scinote/sb_SCI-9557
Replace Scinote Icons [SCI-9557]
2023-10-30 08:57:44 +01:00
Martin Artnik
81bc7bd2db
Merge pull request #6551 from G-Chubinidze/gc_SCI_9596
Filter by archived result does not find anything [SCI-9596]
2023-10-30 08:57:06 +01:00
Giga Chubinidze
9cb1e45302 Filter by archived result does not find anything 2023-10-30 04:53:55 +04:00
sboursen-scinote
b93baeb730 Replace Scinote Icons [SCI-9557] 2023-10-28 12:51:11 +02:00
dependabot[bot]
16722727fb
Bump tinymce from 6.5.1 to 6.7.1 (#6509)
Bumps [tinymce](https://github.com/tinymce/tinymce/tree/HEAD/modules/tinymce) from 6.5.1 to 6.7.1.
- [Changelog](https://github.com/tinymce/tinymce/blob/develop/modules/tinymce/CHANGELOG.md)
- [Commits](https://github.com/tinymce/tinymce/commits/6.7.1/modules/tinymce)

---
updated-dependencies:
- dependency-name: tinymce
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-10-27 11:13:21 +02:00
dependabot[bot]
32da865a0c
Bump browserify-sign from 4.2.1 to 4.2.2 (#6542)
Bumps [browserify-sign](https://github.com/crypto-browserify/browserify-sign) from 4.2.1 to 4.2.2.
- [Changelog](https://github.com/browserify/browserify-sign/blob/main/CHANGELOG.md)
- [Commits](https://github.com/crypto-browserify/browserify-sign/compare/v4.2.1...v4.2.2)

---
updated-dependencies:
- dependency-name: browserify-sign
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-10-27 10:47:59 +02:00
Martin Artnik
22c567d6ae
Merge pull request #6541 from scinote-eln/features/bugfixes-and-css
Features/bugfixes and css
2023-10-27 10:29:29 +02:00
Martin Artnik
5a073b1364
Merge branch 'develop' into features/bugfixes-and-css 2023-10-27 10:29:13 +02:00
Martin Artnik
88b8498dc2
Merge pull request #6540 from scinote-eln/master
Merge master
2023-10-26 15:35:23 +02:00
Martin Artnik
dd70adb59f
Merge pull request #6539 from scinote-eln/hotfix/1.29.1.1
Hotfix/1.29.1.1
2023-10-26 15:28:23 +02:00
Martin Artnik
761b2ebf21
Bump version to 1.29.1.1 2023-10-26 15:27:44 +02:00
Martin Artnik
dc24643cf2
Merge pull request #6537 from scinote-eln/revert-6536-ai-sci-9588-add-paste-image
Revert "Break after first image [SCI-9588]"
2023-10-26 14:58:38 +02:00
Martin Artnik
5fb1a00a21
Revert "Break after first image [SCI-9588]" 2023-10-26 14:58:27 +02:00
Martin Artnik
0fb6d8c54d
Merge pull request #6536 from aignatov-bio/ai-sci-9588-add-paste-image
Break after first image [SCI-9588]
2023-10-26 14:35:10 +02:00
Anton
c90aa8ee62 Break after first image [SCI-9588] 2023-10-26 14:33:44 +02:00
Martin Artnik
0696af987c
Merge pull request #6535 from aignatov-bio/ai-sci-9588-add-paste-image
Fix web insert image [SCI-9127]
2023-10-26 14:27:06 +02:00
Anton
a4e48c798d Fix web insert image [SCI-9127] 2023-10-26 14:24:45 +02:00
Martin Artnik
c79669ba3f
Merge pull request #6534 from aignatov-bio/ai-sci-9588-add-paste-image
Fix i18n for clipboard modal [SCI-9588]
2023-10-26 13:34:19 +02:00
Anton
fded38a5a6 Fix i18n for clipboard modal [SCI-9588] 2023-10-26 13:32:17 +02:00
Alex Kriuchykhin
72ef510edc
Update Travis CI config, temporary switch to only API tests for CI (#6528) 2023-10-26 13:29:52 +02:00
Martin Artnik
590648b4b5
Merge pull request #6533 from aignatov-bio/ai-sci-9588-add-paste-image
Fix image ratio
2023-10-26 13:26:29 +02:00
Anton
261f853b03 Fix image ratio 2023-10-26 13:24:29 +02:00
Martin Artnik
605d5bfcb7
Merge pull request #6532 from aignatov-bio/ai-sci-9588-add-paste-image
Add image paster [SCI-9588]
2023-10-26 12:17:41 +02:00
Anton
0ffd3dcee3 Add image paster [SCI-9588] 2023-10-26 12:15:30 +02:00
Martin Artnik
3ff7bde1c2
Merge pull request #6531 from artoscinote/ma_SCI_9587
Remove max with from result and step text fields [SCI-9587]
2023-10-26 10:24:37 +02:00
Martin Artnik
e8299c2851 Remove max with from result and step text fields [SCI-9587] 2023-10-26 10:23:14 +02:00
Martin Artnik
2a5b596e2b
Merge pull request #6515 from G-Chubinidze/gc_SCI_9533
Text doesn't fit in the flyout when a linked PT has been changed [SCI-9533]
2023-10-26 10:11:02 +02:00
aignatov-bio
df1b54d5d0
Merge pull request #6530 from aignatov-bio/ai-sci-9599-fix-dropdown-click-away
Fix dropdown click aways [SCI-9599]
2023-10-25 14:31:28 +02:00
Anton
7515c979dd Fix dropdown click aways [SCI-9599] 2023-10-25 14:29:08 +02:00
aignatov-bio
ff667a3a2b
Merge pull request #6529 from scinote-eln/features/navigator-resize
Features/navigator resize
2023-10-25 14:05:14 +02:00
Anton
da3c54b7f0 Merge branch 'develop' into features/bugfixes-and-css 2023-10-25 13:26:06 +02:00
Oleksii Kriuchykhin
e4c0ce58b8 Merge branch 'develop' 2023-10-25 11:34:47 +02:00
Oleksii Kriuchykhin
ac56cb429c Bump version to 1.29.1 2023-10-25 11:33:51 +02:00
Martin Artnik
5972140fd0
Merge pull request #6524 from aignatov-bio/ai-sci-9594-fix-marvinjs-in-edit-mode
Fix marvinJS in tinymce [SCI-9594]
2023-10-24 16:33:16 +02:00
Anton
e0f2677d1c Fix marvinJS in tinymce [SCI-9594] 2023-10-24 16:31:20 +02:00
Alex Kriuchykhin
1eece29f84
Fix error at filtering by date on project page [SCI-9590] (#6523) 2023-10-24 16:00:41 +02:00
aignatov-bio
060300c785
Merge pull request #6522 from aignatov-bio/ai-sci-9592-fix-protocol-header
Fix protocol header [SCI-9592]
2023-10-24 13:43:53 +02:00
Anton
d0703f04dc Fix protocol header [SCI-9592] 2023-10-24 13:41:13 +02:00
ajugo
f278f490d9
Fix api tests [SCI-9569] (#6519)
* Fix api tests [SCI-9569]

* Fix inventory status api index [SCI-9569]
2023-10-24 13:36:03 +02:00
Martin Artnik
7f7ed1ea8a
Merge pull request #6521 from artoscinote/ma_SCI_9583
Smart annotation and text value fixes [SCI-9583]
2023-10-24 13:25:58 +02:00
Martin Artnik
0e3c7eaf26 Fix issue with text value rendering [SCI-9583] 2023-10-24 13:15:17 +02:00
Martin Artnik
2850135e96 Revert "Fixed Item card smart annotation link [SCI-9583]"
This reverts commit 0a3ba6a366.
2023-10-24 13:14:23 +02:00
Martin Artnik
1d3c17206c
Merge pull request #6514 from lasniscinote/gl_SCI_9583
Fixed Item card smart annotation link [SCI-9583]
2023-10-23 13:59:37 +02:00
Martin Artnik
ebb2c7537b
Merge pull request #6517 from artoscinote/ma_SCI_9574
Fix user smart annotations [SCI-9574]
2023-10-23 13:37:49 +02:00
Martin Artnik
4d9a3c65f3
Merge pull request #6518 from artoscinote/ma_SCI_9585
Fix members filter [SCI-9585]
2023-10-23 13:34:06 +02:00
Martin Artnik
4f014394e2 Fix members filter [SCI-9585] 2023-10-23 13:31:27 +02:00
Martin Artnik
ee076c7f3b Fix user smart annotations [SCI-9574] 2023-10-23 11:50:24 +02:00
Giga Chubinidze
0d998b3947 Text doesn't fit in the flyout when a linked PT has been changed [SCI-9533] 2023-10-23 08:26:38 +04:00
Gregor Lasnibat
0a3ba6a366 Fixed Item card smart annotation link [SCI-9583] 2023-10-22 08:56:51 +02:00
Martin Artnik
fb539e76d2
Merge pull request #6505 from ivanscinote/SCI-9318-making-navigator-resizable
Set navigator max-width to 400px and fix class for removing transitions [SCI-9318]
2023-10-20 10:26:57 +02:00