Commit graph

17621 commits

Author SHA1 Message Date
Martin Artnik
480754d3d4 Fix date format in file versions modal [SCI-11223] 2024-10-29 09:43:11 +01:00
Martin Artnik
aae0abcd67 UI fixes for File versions modal [SCI-11218] 2024-10-28 15:03:05 +01:00
Martin Artnik
0c774a736e
Merge pull request #7994 from artoscinote/ma_SCI_11215
Fix user-based sorting of repository items [SCI-11215]
2024-10-28 10:28:58 +01:00
Martin Artnik
ddba250086 Fix user-based sorting of repository items [SCI-11215] 2024-10-28 10:19:33 +01:00
Martin Artnik
60bc382f36
Merge pull request #7993 from artoscinote/ma_SCI_11216
When restoring files, also restore preview image [SCI-11216]
2024-10-25 15:24:11 +02:00
Martin Artnik
cbe0e9f2f2 When restoring files, also restore preview image [SCI-11216] 2024-10-25 15:22:18 +02:00
Martin Artnik
8b580823a5
Merge pull request #7989 from artoscinote/ma_SCI_11183
Fix names for duplicated OVE or MarvinJS files [SCI-11183]
2024-10-25 11:35:51 +02:00
Martin Artnik
749c1cd494 Fix names for duplicated OVE or MarvinJS files [SCI-11183] 2024-10-25 10:53:42 +02:00
Alex Kriuchykhin
1939902eb1
Fix NewRelic ignore calls for ActiveJobs [SCI-11212] (#7988) 2024-10-24 13:22:21 +02:00
Alex Kriuchykhin
9c524d8e0e
Exclude API status and health endpoints, scheduled jobs from NewRelic monitoring, update APM agent [SCI-11212] (#7987) 2024-10-23 16:58:03 +02:00
Martin Artnik
4859557212
Merge pull request #7986 from scinote-eln/revert-7782-revert-7678-ma_SCI_10809
Revert "Revert "Timeout slow libreoffice preview generation [SCI-10809]""
2024-10-22 15:33:02 +02:00
Alex Kriuchykhin
21fb93110a
Add option for enabling Aws::Rails::SesMailer for sending emails with AWS SDK [SCI-11207] (#7981) 2024-10-21 17:26:39 +02:00
Martin Artnik
46e06dfef6
Merge pull request #7982 from artoscinote/ma_SCI_11198
Add confirmation modal for repository file delete [SCI-11198]
2024-10-21 17:26:06 +02:00
Martin Artnik
3961b21c00 Add confirmation modal for repository file delete [SCI-11198] 2024-10-21 17:23:13 +02:00
dependabot[bot]
1267293d50
Bump actiontext from 7.0.8.4 to 7.0.8.5 (#7975)
Bumps [actiontext](https://github.com/rails/rails) from 7.0.8.4 to 7.0.8.5.
- [Release notes](https://github.com/rails/rails/releases)
- [Changelog](https://github.com/rails/rails/blob/v7.2.1.1/actiontext/CHANGELOG.md)
- [Commits](https://github.com/rails/rails/compare/v7.0.8.4...v7.0.8.5)

---
updated-dependencies:
- dependency-name: actiontext
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-10-18 14:58:34 +02:00
dependabot[bot]
bed20b2913
Bump actionmailer from 7.0.8.4 to 7.0.8.5 (#7976)
Bumps [actionmailer](https://github.com/rails/rails) from 7.0.8.4 to 7.0.8.5.
- [Release notes](https://github.com/rails/rails/releases)
- [Changelog](https://github.com/rails/rails/blob/v7.2.1.1/actionmailer/CHANGELOG.md)
- [Commits](https://github.com/rails/rails/compare/v7.0.8.4...v7.0.8.5)

---
updated-dependencies:
- dependency-name: actionmailer
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-10-18 14:58:08 +02:00
Martin Artnik
2ac183fd83
Merge pull request #7980 from scinote-eln/features/file-versioning
Features/file versioning
2024-10-17 10:42:06 +02:00
Martin Artnik
7804b46937 Merge branch 'develop' into features/file-versioning 2024-10-16 13:22:28 +02:00
Martin Artnik
da50309204
Bump version to 1.37.0 2024-10-16 10:27:16 +02:00
Martin Artnik
857b77d558
Merge pull request #7978 from artoscinote/ma_SCI_11195
Fix location image dissapearing [SCI-11195]
2024-10-16 09:49:44 +02:00
Martin Artnik
97129d2a2b Fix location image dissapearing [SCI-11195] 2024-10-16 09:47:12 +02:00
Martin Artnik
b7e1596e52
Merge pull request #7974 from artoscinote/ma_SCI_11188
Improve behaviour for private team sharing [SCI-11188]
2024-10-15 23:39:42 +02:00
Martin Artnik
764e7dd663 Improve behaviour for private team sharing [SCI-11188] 2024-10-15 21:17:14 +02:00
aignatov-bio
78c0b8bc88
Merge pull request #7967 from aignatov-bio/ai-sci-11184-create-collapsable-breadcrumbs-component
Add collapsable breadcrumbs component [SCI-11184]
2024-10-15 15:19:24 +02:00
Martin Artnik
1805e723f9
Merge pull request #7972 from artoscinote/ma_SCI_11188
Hide unshared private teams [SCI-11188]
2024-10-15 13:03:29 +02:00
Martin Artnik
d250653a7c Hide unshared private teams [SCI-11188] 2024-10-15 13:01:57 +02:00
Martin Artnik
57079bea51 Add missing translation [SCI-11188] 2024-10-15 12:55:43 +02:00
Alex Kriuchykhin
5e02fff4b3
Fix active repository datatables on shared tasks [SCI-11189] (#7970) 2024-10-14 16:24:17 +02:00
Martin Artnik
a23d998fb7
Merge pull request #7969 from artoscinote/ma_SCI_11188
Fix sharing settings with invisible teams [SCI-11188]
2024-10-14 15:58:03 +02:00
Martin Artnik
f388594884 Fix sharing settings with invisible teams [SCI-11188] 2024-10-14 15:52:47 +02:00
ajugo
e47663e5fb
Merge pull request #7968 from rekonder/aj_SCI_11170
Add file versioning to ove and marvinjs files [SCI-11170]
2024-10-14 15:30:59 +02:00
Andrej
2c56246204 Add file versioning to ove and marvinjs files [SCI-11170] 2024-10-14 15:12:48 +02:00
ajugo
7b30da7220
Merge pull request #7966 from rekonder/aj_SCI_11169
Add restore asset permission [SCI-11169]
2024-10-14 15:09:13 +02:00
Anton
adcc401a79 Add collapsable breadcrumbs component [SCI-11184] 2024-10-14 14:40:21 +02:00
Andrej
50d2bf53dc Add restore asset permission [SCI-11169] 2024-10-14 14:02:28 +02:00
ajugo
cfefef8d01
Merge pull request #7965 from rekonder/aj_SCI_11157
Add activities for asset restore [SCI-11157]
2024-10-14 13:53:54 +02:00
Andrej
262ae9c2c0 Add activities for asset restore [SCI-11157] 2024-10-14 13:45:39 +02:00
Martin Artnik
8c356f7293 Merge branch 'develop' into features/file-versioning 2024-10-14 13:09:42 +02:00
Martin Artnik
ca2c409bb0
Merge pull request #7964 from artoscinote/ma_SCI_11181
Add missing permisson changes [SCI-11181]
2024-10-14 13:07:06 +02:00
Martin Artnik
ba2e2cd686 Add missing permisson changes [SCI-11181] 2024-10-14 13:04:39 +02:00
aignatov-bio
8e0f0e27a7
Merge pull request #7960 from aignatov-bio/ai-sci-10735-update-notifications-flyout
Update notifications flyout [SCI-10735]
2024-10-14 12:09:35 +02:00
Martin Artnik
b0f41eb14b
Merge pull request #7963 from artoscinote/ma_SCI_11181
Further fix team viewer location permissions [SCI-11181]
2024-10-14 12:03:26 +02:00
Martin Artnik
bab4dbd9ef Further fix team viewer location permissions [SCI-11181] 2024-10-14 11:59:32 +02:00
Martin Artnik
a846f4bc58
Merge pull request #7962 from artoscinote/ma_SCI_11182
Fix switching between global share and team shares [SCI-11182]
2024-10-14 11:47:22 +02:00
Martin Artnik
d38ccea98f Fix switching between global share and team shares [SCI-11182] 2024-10-14 11:43:52 +02:00
Martin Artnik
87f2851d9b
Merge pull request #7961 from artoscinote/ma_SCI_11181
Fix location permissions for viewer team role [SCI-11181]
2024-10-14 11:03:59 +02:00
Martin Artnik
7ee81c1a2b Fix location permissions for viewer team role [SCI-11181] 2024-10-14 11:00:43 +02:00
Anton
c71366acc5 Update notifications flyout [SCI-10735] 2024-10-14 10:29:01 +02:00
Alex Kriuchykhin
c18d2b31b2
Fix rendering of HTML elements in inventory tables [SCI-11176] (#7959) 2024-10-11 10:00:46 +02:00
aignatov-bio
bff0ddc496
Merge pull request #7958 from aignatov-bio/ai-sci-11175-fix-validation-for-non-grid-box
Remove position validation for non grid box [SCI-11175]
2024-10-10 14:56:58 +02:00