Commit graph

16488 commits

Author SHA1 Message Date
Martin Artnik
1209bb8615
Merge pull request #7197 from G-Chubinidze/gc_SCI_10237
HTML report from exported project security issue [SCI-10237]
2024-03-12 11:01:22 +01:00
Soufiane
4c286db15f
Fix user smartAnnotation overflow in commnet sidebar [SCI-7842] (#7234) 2024-03-12 10:21:34 +01:00
ajugo
8aadca10c5
Fix displaying of archived objects for experiments and tasks lists [SCI-10418] (#7255) 2024-03-12 10:10:05 +01:00
Alex Kriuchykhin
e835925ab9
Improve sign in handling in OmniAuth controller [SCI-10421] (#7247) 2024-03-12 09:43:53 +01:00
Giga Chubinidze
47b61f526c Incorrect translation of a button in the "Tags" modal [SCI-10405] 2024-03-12 12:26:36 +04:00
ajugo
cfbd0bdaa9
Merge pull request #7225 from aignatov-bio/ai-sci-10402-fix-tags-modal-canvas
Fix tags modal on canvas [SCI-10402]
2024-03-12 07:20:55 +01:00
Gregor Lasnibat
e8b4e40391 (dev) Create a POC for Phase 0 of improved importing to inventories [SCI-10222] 2024-03-11 15:55:36 +01:00
Giga Chubinidze
134a3393d4 rename loop variable [SCI-10200] 2024-03-11 17:39:20 +04:00
Giga Chubinidze
4ce4b90e3c Inventory export for checklists with return delimiter should escape the return sign [SCI-10200] 2024-03-11 17:27:13 +04:00
Soufiane
a9537f06dd
Fix tests after table revamp [SCI-10271] (#7220) 2024-03-11 13:08:42 +01:00
ajugo
e7bd0d5764
Merge pull request #7242 from G-Chubinidze/gc_SCI_10251_v2
Inventory duplicating removes old inventory stock units [SCI-10251]
2024-03-08 16:27:32 +01:00
Giga Chubinidze
ac47dcf0a5 Inventory duplicating removes old inventory stock units [SCI-10251] 2024-03-08 18:33:13 +04:00
Martin Artnik
ace245c11f Merge branch 'develop' into features/inventory-import-improvements 2024-03-08 11:24:51 +01:00
Martin Artnik
54022dcd63 Merge branch 'develop' into features/inventory-import-improvements 2024-03-08 11:22:16 +01:00
Oleksii Kriuchykhin
d004b1e7a0 Merge branch 'features/bugfixes' into develop 2024-03-08 11:21:26 +01:00
Martin Artnik
741e81ef60 Fix experiment description modal smart annotations [SCI-10340] 2024-03-08 10:40:58 +01:00
Martin Artnik
be1b514143
Merge pull request #7230 from lasniscinote/gl_SCI_10076
(fix) TinyMCE issues - Code samples & Wide tables [SCI-10076_v2]
2024-03-08 09:49:08 +01:00
Gregor Lasnibat
2074c1df5d (fix) TinyMCE issues - Code samples & Wide tables [SCI-10076] 2024-03-08 09:44:22 +01:00
Ivan Kljun
1d96d37f4c Enable XLSX repository exports [SCI-10268] 2024-03-08 09:23:26 +01:00
aignatov-bio
dff94150ff
Merge pull request #7228 from rekonder/aj_SCI_10372
Fix access modal opening for viewer on task [SCI-10372]
2024-03-07 17:58:17 +01:00
Andrej
08d21e8854 Fix access modal opening for viewer on task [SCI-10372] 2024-03-07 17:52:09 +01:00
aignatov-bio
fa13a376a0
Action toolbar fix for small screens [SCI-10346] (#7221) 2024-03-07 13:36:30 +01:00
aignatov-bio
8e918edce3
Fix loading marker [SCI-10386] (#7223) 2024-03-07 13:36:11 +01:00
ajugo
bd920611e9
Fix read project users permission [SCI-10355] (#7224) 2024-03-07 13:32:20 +01:00
Anton
ea5e77decd Fix tags modal on canvas [SCI-10402] 2024-03-07 12:59:21 +01:00
ajugo
8407361083
Merge pull request #7215 from G-Chubinidze/gc_SCI_10239
For item relationship missing archived tag for inventory [SCI-10239]
2024-03-07 08:50:06 +01:00
ajugo
88f8ef00ee
Merge pull request #7214 from wandji20/wb-SCI-10068
Fix broken import statement [SCI-10068]
2024-03-07 08:47:37 +01:00
Giga Chubinidze
9549d8b481 Date, time and Date & Time columns will not be saved when applied in the item card [SCI-10303] 2024-03-07 06:04:22 +04:00
Giga Chubinidze
3d83e0e0b7 Replace with new icon for column management on inventory page [SCI-10373] 2024-03-07 05:21:08 +04:00
Giga Chubinidze
afe573a044 For item relationship missing archived tag for inventory [SCI-10239] 2024-03-07 04:25:03 +04:00
wandji20
d21e2d0978 Fix broken import statement [SCI-10068] 2024-03-06 19:04:57 +01:00
aignatov-bio
c3afc88f63
Merge pull request #7212 from rekonder/aj_SCI_10372
Fix loading of access and tags modal [SCI-10372]
2024-03-06 16:43:20 +01:00
aignatov-bio
d47b98f6fb
Merge pull request #7211 from aignatov-bio/ai-sci-10357-access-member-fixes
Update access modal interactions [SCI-10357][SCI-10348]
2024-03-06 16:39:53 +01:00
Andrej
59ddebea2f Fix loading of access and tags modal [SCI-10372] 2024-03-06 16:39:45 +01:00
aignatov-bio
20307b4a80
Merge pull request #7210 from lasniscinote/gl_SCI_10363
(fix) Item card - dropdown and checklist [SCI-10363]
2024-03-06 16:21:57 +01:00
Gregor Lasnibat
51ae5aa966 (fix) Item card - dropdown and checklist [SCI-10363] 2024-03-06 16:19:59 +01:00
Anton
a8f97e3ba5 Update access modal interactions [SCI-10357] 2024-03-06 16:17:24 +01:00
Alex Kriuchykhin
c1263eb06f
Fix ordering by ID in protocols and tasks tables, remove obsolete protocols datatable [SCI-10387] (#7209) 2024-03-06 16:04:41 +01:00
Martin Artnik
64e926f98e
Merge pull request #7205 from G-Chubinidze/gc_SCI_10291
Button code for "Open locally" [SCI-10291]
2024-03-06 15:03:55 +01:00
aignatov-bio
1e661e5945
Merge pull request #7206 from aignatov-bio/ai-sci-10379-fix-table-state
Fix table state [SCI-10379]
2024-03-06 14:55:25 +01:00
ajugo
d2b097599f
Improve projects table loading speed [SCI-10147] (#7136) 2024-03-06 14:48:30 +01:00
wandji
a9ceda717b
Allow send wopi action without manage permission [SCI-9836] (#7178) 2024-03-06 14:17:17 +01:00
ajugo
bd22084298
Remove title for experiment description [SCI-10281] (#7204) 2024-03-06 14:11:33 +01:00
ajugo
654b107965
Fix ordering on share repository modal [SCI-4716] (#7207) 2024-03-06 13:58:31 +01:00
dependabot[bot]
e15387ccde
Bump rack-cors from 2.0.1 to 2.0.2 (#7208)
Bumps [rack-cors](https://github.com/cyu/rack-cors) from 2.0.1 to 2.0.2.
- [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cyu/rack-cors/compare/v2.0.1...v2.0.2)

---
updated-dependencies:
- dependency-name: rack-cors
  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-03-06 13:56:21 +01:00
dependabot[bot]
81582d2816
Bump json-jwt from 1.16.3 to 1.16.6 (#7198)
Bumps [json-jwt](https://github.com/nov/json-jwt) from 1.16.3 to 1.16.6.
- [Release notes](https://github.com/nov/json-jwt/releases)
- [Changelog](https://github.com/nov/json-jwt/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nov/json-jwt/compare/v1.16.3...v1.16.6)

---
updated-dependencies:
- dependency-name: json-jwt
  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-03-06 13:54:12 +01:00
wandji
690e0d421f
Add advance filter for relationships to inventory items table [SCI-10068] (#7007) 2024-03-06 13:48:15 +01:00
dependabot[bot]
760352abf8
Bump rack from 2.2.8 to 2.2.8.1 (#7166)
Bumps [rack](https://github.com/rack/rack) from 2.2.8 to 2.2.8.1.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/v2.2.8...v2.2.8.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-03-06 13:43:31 +01:00
dependabot[bot]
6f0eb002b7
Bump rails from 7.0.5.1 to 7.0.8.1 (#7149)
Bumps [rails](https://github.com/rails/rails) from 7.0.5.1 to 7.0.8.1.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v7.0.5.1...v7.0.8.1)

---
updated-dependencies:
- dependency-name: rails
  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-03-06 13:43:11 +01:00
Anton
9a7546cac8 Fix table state [SCI-10379] 2024-03-06 11:49:51 +01:00