Commit graph

18159 commits

Author SHA1 Message Date
Martin Artnik
21c6dbb0ce Fix search for special characters and add specs [SCI-11597] 2025-02-24 15:07:18 +01:00
Martin Artnik
0405206335
Merge pull request #8268 from artoscinote/ma_SCI_11595
Render smart annotations in print/report/shared task tables [SCI-11595]
2025-02-21 14:07:44 +01:00
Martin Artnik
6ae03c3494 Render smart annotations in print/report/shared task tables [SCI-11595] 2025-02-21 13:48:45 +01:00
andrej-scinote
69ea158e3c
Merge pull request #8266 from andrej-scinote/aj_SCI_11596
Fix table console errors [SCI-11596]
2025-02-21 11:39:54 +01:00
Andrej
be1e4d44f8 Fix table console errors [SCI-11596] 2025-02-21 11:23:24 +01:00
aignatov-bio
77e06b00ce
Merge pull request #8263 from aignatov-bio/ai-sci-11594-fix-report-translations
Fix report table translations [SCI-11594]
2025-02-21 10:03:42 +01:00
Anton
758eee7041 Fix report table translations [SCI-11594] 2025-02-20 13:53:46 +01:00
Martin Artnik
893314dd3a
Merge pull request #8256 from artoscinote/ma_SCI_11513
Switch inventory text cells smart annotation to frontend rendering [SCI-11513]
2025-02-20 13:46:19 +01:00
Martin Artnik
d055f1e9d5 Switch inventory text cells smart annotation to frontend rendering [SCI-11513] 2025-02-19 15:20:44 +01:00
Martin Artnik
5a1da39011 Merge branch 'develop' into features/native-tables-revamp 2025-02-18 15:47:36 +01:00
Martin Artnik
060ececf38 Merge branch 'master' into develop 2025-02-18 14:52:34 +01:00
aignatov-bio
7e9897e15f
Merge pull request #8233 from aignatov-bio/ai-sci-11546-fix-in-report-translations
Fix well plate translation [SCI-11546]
2025-02-18 13:40:45 +01:00
Martin Artnik
28b223a65f
Merge pull request #8254 from scinote-eln/hotfix/1.39.1.2
February 2025 Hotfix 2
2025-02-18 13:26:53 +01:00
Martin Artnik
1252e67700
Merge branch 'master' into hotfix/1.39.1.2 2025-02-18 13:11:58 +01:00
Martin Artnik
a28e024cb3
Bump version to 1.39.1.2 2025-02-18 13:06:28 +01:00
dependabot[bot]
8817b6f544
Bump rack from 2.2.10 to 2.2.11 (#8239)
Bumps [rack](https://github.com/rack/rack) from 2.2.10 to 2.2.11.
- [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.10...v2.2.11)

---
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>
2025-02-17 17:29:24 +01:00
Andrej
e82e2e95e9 Fix reloading of protocol table after protocol publish [SCI-11304] 2025-02-17 15:34:33 +01:00
Martin Artnik
03d7698c9a
Merge pull request #8248 from artoscinote/ma_SCI_11575
Add frontend rendering option for smart annotations [SCI-11575]
2025-02-17 14:58:36 +01:00
Martin Artnik
21810535a1 Add frontend rendering option for smart annotations [SCI-11575] 2025-02-17 14:31:18 +01:00
andrej-scinote
f39d850198
Merge pull request #8245 from andrej-scinote/aj_SCI_11584
Update icons library [SCI-11584]
2025-02-17 11:48:37 +01:00
Andrej
9005ede234 Update icons library [SCI-11584] 2025-02-17 11:46:15 +01:00
Martin Artnik
6438b050fc Include global constants in print protocol layout [SCI-11583] 2025-02-14 14:01:24 +01:00
dependabot[bot]
67dc83d8cf
Bump elliptic from 6.6.0 to 6.6.1 (#8237)
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.6.0 to 6.6.1.
- [Commits](https://github.com/indutny/elliptic/compare/v6.6.0...v6.6.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-02-14 10:35:24 +01:00
dependabot[bot]
5c7ad932b3
Bump serialize-javascript from 6.0.1 to 6.0.2 (#8238)
Bumps [serialize-javascript](https://github.com/yahoo/serialize-javascript) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/yahoo/serialize-javascript/releases)
- [Commits](https://github.com/yahoo/serialize-javascript/compare/v6.0.1...v6.0.2)

---
updated-dependencies:
- dependency-name: serialize-javascript
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-02-14 10:28:41 +01:00
dependabot[bot]
22e5867932
Bump net-imap from 0.4.17 to 0.4.19 (#8223)
Bumps [net-imap](https://github.com/ruby/net-imap) from 0.4.17 to 0.4.19.
- [Release notes](https://github.com/ruby/net-imap/releases)
- [Commits](https://github.com/ruby/net-imap/compare/v0.4.17...v0.4.19)

---
updated-dependencies:
- dependency-name: net-imap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-02-14 10:04:24 +01:00
andrej-scinote
4fa8c8280d
Merge pull request #8236 from andrej-scinote/aj_SCI_11581
Fix shared task smart annotation bug [SCI-11581]
2025-02-14 09:17:38 +01:00
Andrej
fa156005ed Fix shared task smart annotation bug [SCI-11581] 2025-02-14 08:01:07 +01:00
andrej-scinote
2635d08618
Merge pull request #8235 from andrej-scinote/aj_SCI_11549
Fix notification destroy in user data deletion [SCI-11549]
2025-02-13 15:10:12 +01:00
Andrej
5d16a1c445 Fix notification destroy in user data deletion [SCI-11549] 2025-02-13 14:50:22 +01:00
Martin Artnik
ace4139a84 Merge branch 'develop' into features/native-tables-revamp 2025-02-13 14:33:19 +01:00
Anton
d1cf683cb0 Fix well plate translation [SCI-11546] 2025-02-13 12:59:37 +01:00
Martin Artnik
82fcfc867c
Merge pull request #8232 from scinote-eln/release/1.39.1
Release/1.39.1
2025-02-13 12:23:47 +01:00
Martin Artnik
8315880bb6
Merge pull request #8231 from scinote-eln/hotfix/1.39.1.1
Hotfix/1.39.1.1
2025-02-13 12:22:35 +01:00
Martin Artnik
5fc63178a3
Merge pull request #8229 from artoscinote/ma_SCI_11567
Set explicit format for global_constants javascript [SCI-11567]
2025-02-12 15:49:10 +01:00
Martin Artnik
190224009e Set explicit format for global_constants javascript [SCI-11567] 2025-02-12 15:39:26 +01:00
Martin Artnik
1f08fbb986
Bump version to 1.39.1.1 2025-02-12 15:16:57 +01:00
Martin Artnik
82da01c94f
Merge pull request #8228 from artoscinote/ma_SCI_11573
Fix three dot action menu [SCI-11573]
2025-02-12 15:15:44 +01:00
Martin Artnik
f1ebcd5a78 Fix three dot action menu [SCI-11573] 2025-02-12 15:10:40 +01:00
Martin Artnik
30de6c9db7
Merge pull request #8226 from scinote-eln/develop
February 2025 Release
2025-02-11 15:43:43 +01:00
Martin Artnik
dd5526175a
Merge branch 'master' into develop 2025-02-11 15:27:57 +01:00
Martin Artnik
89e7977d90
Bump version to 1.39.1 2025-02-11 15:21:53 +01:00
Martin Artnik
fb64248b90
Merge pull request #8219 from artoscinote/ma_SCI_11548
Fix positioning of 'Processing' element on legacy datatables [SCI-11548]
2025-02-10 10:47:18 +01:00
Martin Artnik
088583706a Fix positioning of 'Processing' element on legacy datatables [SCI-11548] 2025-02-10 10:38:46 +01:00
Alex Kriuchykhin
0a36bb7e2b
Fix inventory show when navigating by a link from another team [SCI-11532] (#8218) 2025-02-10 10:15:08 +01:00
Martin Artnik
5e747f88a1
Merge pull request #8216 from artoscinote/ma_SCI_11495
Update SciNote Edit version modal copy [SCI-11495]
2025-02-07 13:10:46 +01:00
Martin Artnik
5dda0633b6 Update SciNote Edit version modal copy [SCI-11495] 2025-02-07 13:08:13 +01:00
Martin Artnik
8dbc466ea0
Merge pull request #8215 from artoscinote/ma_SCI_11489
Change update task items modal to use POST [SCI-11489]
2025-02-07 12:37:23 +01:00
Martin Artnik
76931ed0b6 Change update task items modal to use POST [SCI-11489] 2025-02-07 11:50:18 +01:00
Alex Kriuchykhin
bfb067cd7a
Fix global search for inventory items from shared inventories [SCI-11532] (#8212) 2025-02-06 09:26:25 +01:00
Martin Artnik
3694bd6f2b
Merge pull request #8213 from artoscinote/ma_SCI_9221
Fix print button stuck as disabled when printing via a Zebra printer [SCI-9221]
2025-02-05 16:40:03 +01:00