Commit graph

15802 commits

Author SHA1 Message Date
ajugo
230f283aec
Merge pull request #7111 from rekonder/aj_SCI_10171
Improve query for assigned task counter on protocol template [SCI-10171]
2024-02-20 10:33:50 +01:00
Andrej
a6774772a4 Improve query for assigned task counter on protocol template [SCI-10171] 2024-02-20 09:55:45 +01:00
Martin Artnik
b0f5f0353d
Merge pull request #7104 from artoscinote/ma_SCI_10232
Fixed typos in clone experiment action [SCI-10232]
2024-02-19 10:50:06 +01:00
Martin Artnik
fc441bbfaa Fixed typos in clone experiment action [SCI-10232] 2024-02-19 10:46:47 +01:00
Martin Artnik
41df10a2ee
Merge pull request #7103 from artoscinote/ma_SCI_10228
Fix making backup copy of conflicting files [SCI-10228]
2024-02-16 13:26:40 +01:00
Martin Artnik
7ac00c5007 Fix making backup copy of conflicting files [SCI-10228] 2024-02-16 13:06:17 +01:00
Alex Kriuchykhin
156f9bda9c
Fix text extraction for cloned files [SCI-10227] (#7101) 2024-02-16 12:51:47 +01:00
Martin Artnik
da8f2ff217
Merge pull request #7099 from ivanscinote/SCI-10103-ik2
Fix asset sync update to account for WOPI and post process [SCI-10103]
2024-02-16 10:46:00 +01:00
Ivan Kljun
aae8d4d227 Remove team arg from post_process_file [SCI-10103] 2024-02-16 10:39:19 +01:00
Ivan Kljun
c8b910ebc4 Merge remote-tracking branch 'upstream/develop' into SCI-10103-ik2 2024-02-16 10:06:27 +01:00
Ivan Kljun
c043a9375a Fix asset sync update to account for WOPI and post process [SCI-10103] 2024-02-16 09:53:26 +01:00
wandji
f48bb35c67
Only call inventory table restoreColumnSize in save state callbback on initial load [SCI-10195] (#7097) 2024-02-16 09:45:06 +01:00
Martin Artnik
8f96ef6eb7
Merge pull request #7096 from artoscinote/ma_SCI_10087
Block header links of smart annotation on long loads [SCI-10087]
2024-02-15 15:29:12 +01:00
Martin Artnik
c273219a00 Block header links of smart annotation on long loads [SCI-10087] 2024-02-15 14:49:22 +01:00
Martin Artnik
916b310459
Merge pull request #7095 from ivanscinote/SCI-10033-ik
Fix saving last_modified_by for WOPI audit trails [SCI-10033]
2024-02-15 14:21:20 +01:00
Ivan Kljun
e35878a9b8 Fix saving last_modified_by for WOPI audit trails [SCI-10033] 2024-02-15 14:14:38 +01:00
Martin Artnik
090f42c36b
Merge pull request #7094 from artoscinote/ma_SCI_10224
Modal code cleanup [SCI-10224]
2024-02-15 14:11:58 +01:00
Martin Artnik
35dc70048e Modal code cleanup [SCI-10224] 2024-02-15 14:10:24 +01:00
Gregor Lasnibat
82d9996f22
(fix) CSS for Quartzy [SCI-10159-core] (#7090) 2024-02-15 14:05:31 +01:00
Martin Artnik
6fa68adbb8
Merge pull request #7092 from artoscinote/ma_SCI_10224
Fix WOPI editing not opening in new tab [SCI-10224]
2024-02-15 13:16:55 +01:00
Martin Artnik
87eeaab08d Fix WOPI editing not opening in new tab [SCI-10224] 2024-02-15 13:15:05 +01:00
ajugo
e026f2b135
Add check for showing consumption column [SCI-10185] (#7085) 2024-02-15 13:00:09 +01:00
ajugo
b14912e70e
Fix assigned repository export in project export [SCI-10193] (#7087) 2024-02-15 11:33:23 +01:00
ajugo
7fe6aae843
Fix consumption check for full view repository [SCI-10184] (#7082) 2024-02-13 15:05:34 +01:00
Soufiane
daa5280521
Update the navigator tree on state change and owner assignement permission change [SCI-10123] (#7081) 2024-02-13 15:04:57 +01:00
ajugo
230b580ba2
Improve loading speed of protocol template [SCI-10171] (#7077) 2024-02-13 15:04:30 +01:00
Martin Artnik
bf6e990435
Merge pull request #7080 from artoscinote/ma_SCI_10087
Show loader when loading smart annotations [SCI-10087]
2024-02-12 15:54:35 +01:00
Martin Artnik
baa2201622
Merge pull request #7070 from ivanscinote/SCI-10122-ik
Add polling for asset changes for SciNote Edit [SCI-10122]
2024-02-12 14:15:48 +01:00
Soufiane
ef16651cf3
Fix Docx preview marking as ready [SCI-10037] (#7074) 2024-02-12 13:44:02 +01:00
Martin Artnik
f2d06a9636 Show loader when loading smart annotations [SCI-10087] 2024-02-12 12:58:57 +01:00
Martin Artnik
81dfe38f07
Merge pull request #7076 from artoscinote/ma_SCI_10183
SciNote version modal fixes [SCI-10183]
2024-02-12 11:59:57 +01:00
Martin Artnik
86ab489da3 SciNote version modal fixes [SCI-10183] 2024-02-12 11:25:34 +01:00
Martin Artnik
150368743c
Merge pull request #7073 from ivanscinote/SCI-10033-ik
Fix applying last_modified_by at asset update [SCI-10033]
2024-02-07 15:48:45 +01:00
Ivan Kljun
5276faa74b Fix applying last_modified_by at asset update [SCI-10033] 2024-02-07 15:31:13 +01:00
Ivan Kljun
aec115f669 Add polling for asset changes for SciNote Edit [SCI-10122] 2024-02-07 11:26:40 +01:00
Alex Kriuchykhin
8fa1c21e73
Fix snapshoting for LinkedRepository caused by external_id uniqueness constraint [SCI-9817] (#7066) 2024-02-06 14:23:01 +01:00
Alex Kriuchykhin
8abc39d4f6
Fix cloning for LinkedRepository coused by external_id uniqueness constraint [SCI-9879] (#7063) 2024-02-06 12:59:21 +01:00
Martin Artnik
d5df5205ad
Merge pull request #7062 from aignatov-bio/ai-sci-10149-fix-experiment-menu
Fix experiment menu [SCI-10149]
2024-02-06 11:19:08 +01:00
Anton
51d9dbcd63 Fix experiment menu [SCI-10149] 2024-02-06 11:17:39 +01:00
dependabot[bot]
3e2d1651ec
Bump nokogiri from 1.14.5 to 1.16.2 (#7059)
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.14.5 to 1.16.2.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.14.5...v1.16.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-06 09:09:18 +01:00
Alex Kriuchykhin
4f89318e1f
Upgrade version of Axios JS library (#7057) 2024-02-05 16:59:53 +01:00
Alex Kriuchykhin
342e9dbb19
Switch to asset text extraction with ActiveStorage analyzer [SCI-9954] (#6956) 2024-02-05 16:24:06 +01:00
Alex Kriuchykhin
7155d7862a
Add missing dependent option to many-to-many relations [SCI-10036] (#7024) 2024-02-05 13:36:12 +01:00
Martin Artnik
6d10159fce
Merge pull request #7049 from lasniscinote/gl_SCI_10099
(fix) Create new SciNote-apps section and place SciNote Edit in [SCI-10099]
2024-02-05 13:26:05 +01:00
Martin Artnik
9c51e15898
Merge pull request #7053 from artoscinote/ma_SCI_9757
Open locally button fixes on preview [SCI-9757]
2024-02-05 13:19:05 +01:00
Martin Artnik
07dd5fa5ed
Merge pull request #6960 from artoscinote/ma_SCI_10021
Add create activity in case of file conflict [SCI-10021]
2024-02-05 13:13:20 +01:00
Martin Artnik
3a700bae13 Add create activity in case of asset sync file conflict [SCI-10021] 2024-02-05 13:12:21 +01:00
Martin Artnik
b5b29f66fc Open locally button fixes on preview [SCI-9757] 2024-02-05 12:45:15 +01:00
ajugo
a556706130
Remove calculations for numbers on cell duplicating [SCI-9958] (#7052) 2024-02-05 10:27:42 +01:00
ajugo
6184d0caa8
Add obsolete tag for not used activites [SCI-10121] (#7050) 2024-02-05 10:25:20 +01:00