Commit graph

16449 commits

Author SHA1 Message Date
Ivan Kljun
e2c4f0c214 Merge remote-tracking branch 'upstream/features/inventory-import-improvements' into SCI-10268-ik 2024-03-28 12:32:43 +01:00
wandji20
9a90bc67f6 Replace expired link on the Zebra printer instructions page [SCI-10545] 2024-03-28 12:27:06 +01:00
wandji20
d4d2ad55e6 Fix Canvas - Broken new comment badge while adding new comments [SCI-10541] 2024-03-28 12:03:17 +01:00
Ivan Kljun
8cd28e3aa6 Merge remote-tracking branch 'upstream/features/inventory-import-improvements' into SCI-10256-ik 2024-03-28 11:32:21 +01:00
Martin Artnik
bd3968c4a6
Merge pull request #7233 from artoscinote/ma_SCI_10257
Add duplicate asset functionality [SCI-10257]
2024-03-28 09:54:32 +01:00
Martin Artnik
ea4c356e10 Add file duplicate activities [SCI-10257] 2024-03-28 09:52:58 +01:00
Ivan Kljun
580f67dbf1 Refactor method for renaming attached files [SCI-10256] 2024-03-28 08:46:40 +01:00
aignatov-bio
eb41e25e8a
Merge pull request #7386 from aignatov-bio/ai-sci-10538-small-fixes-access-and-experiment
Fix access modal all role and experiment card [SCI-10538][SCI-10539]
2024-03-27 16:57:11 +01:00
aignatov-bio
4642e5c7ef
Merge pull request #7385 from sboursen-scinote/sb_SCI-10525
Fix project export success flash [SCI-10525]
2024-03-27 16:56:52 +01:00
aignatov-bio
45345d3823
Merge pull request #7368 from sboursen-scinote/sb_SCI-10521
Fix hover state for 'generate' docx report [SCI-10521]
2024-03-27 16:56:30 +01:00
Anton
ff463b9776 Fix access modal all role and experiment card [SCI-10538][SCI-10539] 2024-03-27 16:51:56 +01:00
sboursen-scinote
070049a3c0 Fix hover state for 'generate' docx report [SCI-10521] 2024-03-27 13:53:56 +01:00
sboursen-scinote
c6d0f0af99 Fix project export success flash [SCI-10525] 2024-03-27 13:31:29 +01:00
Martin Artnik
7c92d9beba Add duplicate asset functionality [SCI-10257] 2024-03-27 12:56:45 +01:00
ajugo
182a2e8935
Merge pull request #7383 from aignatov-bio/ai-sci-10532-fix-updated-on-filter-on-experiments
Fix updated_on filter on experiments [SCI-10532]
2024-03-27 12:48:32 +01:00
Anton
84c20fddbb Fix updated_on filter on experiments [SCI-10532] 2024-03-27 11:52:11 +01:00
ajugo
5fd195a855
Merge pull request #7380 from aignatov-bio/ai-sci-10524-fix-project-stretched-cards
Fix cards grid for big screens [SCI-10524]
2024-03-27 11:29:14 +01:00
aignatov-bio
57e8dd5ee7
Merge pull request #7382 from wandji20/wb-SCI-10367
Small CSS fix [SCI-10367]
2024-03-27 11:27:05 +01:00
wandji20
da01c46281 Small CSS fix 2024-03-27 11:21:25 +01:00
aignatov-bio
ef63b7ac8a
Merge pull request #7381 from aignatov-bio/ai-sci-10526-fix-right-open-flyouts
Fix right open flyouts [SCI-10526]
2024-03-27 11:15:50 +01:00
Anton
771d32d80e Fix right open flyouts [SCI-10526] 2024-03-27 11:11:01 +01:00
Anton
f64db2a397 Fix cards grid for big screens [SCI-10524] 2024-03-27 10:54:11 +01:00
Martin Artnik
939580c0ab
Merge pull request #7370 from artoscinote/ma_SCI_10461
Cache all SciNote edit responses on window, so the endpoints get called once per page load [SCI-10461]
2024-03-27 10:50:08 +01:00
aignatov-bio
3370bf76fb
Merge pull request #7369 from sboursen-scinote/sb_SCI-10519-fix
Center experiment description in table view [SCI-10519]
2024-03-27 10:21:34 +01:00
dependabot[bot]
242e29875d
Bump rdoc from 6.3.3 to 6.3.4.1 (#7364)
Bumps [rdoc](https://github.com/ruby/rdoc) from 6.3.3 to 6.3.4.1.
- [Release notes](https://github.com/ruby/rdoc/releases)
- [Changelog](https://github.com/ruby/rdoc/blob/master/History.rdoc)
- [Commits](https://github.com/ruby/rdoc/compare/v6.3.3...v6.3.4.1)

---
updated-dependencies:
- dependency-name: rdoc
  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-26 16:45:04 +01:00
Ivan Kljun
7366134fe3 Merge remote-tracking branch 'upstream/features/inventory-import-improvements' into SCI-10256-ik 2024-03-26 15:28:09 +01:00
ajugo
6c0a598356
Merge pull request #7371 from sboursen-scinote/sb_SCI-10517
Owner of project is able to change own roles on child objects [SCI-10517]
2024-03-26 14:55:00 +01:00
sboursen-scinote
b0341beeed Disable user roles change for owner in inherited access permission [SCI-10517] 2024-03-26 14:31:22 +01:00
Martin Artnik
2aaf94051c Merge branch 'release/1.30.0' into develop 2024-03-26 14:23:21 +01:00
Martin Artnik
f9b8092dba Cache all SciNote edit responses on window, so the endpoints get called once per page load [SCI-10461] 2024-03-26 13:44:27 +01:00
sboursen-scinote
3dc0e17a7e Center experiment description for tables [SCI-10519] 2024-03-26 12:37:48 +01:00
ajugo
4beb3fae96
Merge pull request #7354 from wandji20/wb-SCI-9901
Improve logic for showing disabled edit button in unsupported wopi file previews [SCI-9901]
2024-03-26 10:16:46 +01:00
Giga Chubinidze
6d2de3ca12 Enable adding negative numbers in Number column type in Inventories [SCI-10394] 2024-03-26 12:44:31 +04:00
aignatov-bio
76b7c93451
Merge pull request #7363 from sboursen-scinote/sb_SCI-10519
Add small css fixes for more link in experiment description [SCI-10519]
2024-03-26 09:18:06 +01:00
aignatov-bio
9b62e35d8e
Merge pull request #7360 from sboursen-scinote/sb_SCI-10518
Highlight user's current user assignment on access modal [SCI-10518]
2024-03-26 09:17:46 +01:00
aignatov-bio
539f58441a
Merge pull request #7359 from wandji20/wb-SCI-10367
Fix task assigned users search query and CSS [SCI-10367]
2024-03-26 09:15:31 +01:00
aignatov-bio
a223903650
Merge pull request #7358 from aignatov-bio/ai-sci-10514-small-issues-with-tags-modal
Small issues in tags modal [SCI-10514]
2024-03-26 09:13:39 +01:00
sboursen-scinote
73b7572cd5 Add small css fixes for more link in experiment description [SCI-10519] 2024-03-25 18:33:43 +01:00
Gregor Lasnibat
8ecef3719c
Merge pull request #7278 from lasniscinote/gl_SCI_10398
(dev) Skip archived items and items not in the current inventory when importing an inventory [SCI-10398]
2024-03-25 13:08:16 +01:00
Gregor Lasnibat
411a182f25
Merge pull request #7291 from lasniscinote/gl_SCI_10399
(dev) Detect duplicated item IDs when parsing a spreadsheet [SCI-10399]
2024-03-25 13:03:44 +01:00
Ivan Kljun
de2918b207 Fix checklist reordening [SCI-10351] 2024-03-25 12:55:48 +01:00
sboursen-scinote
578309499c Highlight user's current user assignement on access modal [SCI-10518] 2024-03-25 12:10:57 +01:00
wandji20
09f4ad7a3d Fix task assgned users search query and CSS [SCI-10367] 2024-03-25 12:01:48 +01:00
Gregor Lasnibat
640f3168bc (dev) Detect duplicated item IDs when parsing a spreadsheet [SCI-10399] 2024-03-25 11:52:53 +01:00
ajugo
4c32ccd06a
Merge pull request #7356 from sboursen-scinote/sb_SCI-10512-fix
Fix you in access permission modal [SCI-10512]
2024-03-25 11:33:49 +01:00
aignatov-bio
304cf5a0d0
Merge pull request #7357 from rekonder/aj_SCI_10505
Fix last tag deletion [SCI-10505]
2024-03-25 11:25:46 +01:00
Anton
28dd646d86 Small issues in tags modal [SCI-10514] 2024-03-25 11:24:21 +01:00
sboursen-scinote
8f47c795d0 Fix you in access permission modal [SCI-10512] 2024-03-25 10:58:47 +01:00
Andrej
320bf21347 Fix last tag deletion [SCI-10505] 2024-03-25 10:52:01 +01:00
Martin Artnik
167d57b3d1
Merge pull request #7328 from lasniscinote/gl_SCI_10313
(fix) Improve the appearance of List view in File attachments [SCI-10313]
2024-03-25 10:23:02 +01:00