Commit graph

17675 commits

Author SHA1 Message Date
Anton
c18e11ef19 Update icon font 2024-11-19 10:56:19 +01:00
andrej-scinote
d1c918b68f
Merge pull request #8033 from andrej-scinote/aj_SCI_10644
Fix generating of double activities [SCI-10644]
2024-11-12 10:07:27 +01:00
Andrej
b36c4fdefd Fix generating of double activities [SCI-10644] 2024-11-12 06:25:45 +01:00
andrej-scinote
f6f9ea1990
Merge pull request #8029 from andrej-scinote/aj_SCI_10986
Fix date on protocol step metadata [SCI-10986]
2024-11-08 15:15:33 +01:00
Andrej
06ac266bce Fix date on protocol step metadata [SCI-10986] 2024-11-08 15:05:11 +01:00
andrej-scinote
3a8bb41220
Merge pull request #8024 from andrej-scinote/aj_SCI_11243
Disable editing of stock column in repository edit mode [SCI-11243]
2024-11-08 11:32:49 +01:00
Andrej
9ff5d97279 Disable editing of stock column in repository edit mode [SCI-11243] 2024-11-08 11:23:28 +01:00
Martin Artnik
ae832cb3d3 Change reserved keyword variable name 2024-11-07 10:56:15 +01:00
Martin Artnik
d9ae88f22a
Merge pull request #8019 from scinote-eln/vue-component-override
Add js file overrides support for engines
2024-11-07 10:53:56 +01:00
Martin Artnik
b0a5a8ac6e Add js file overrides support for engines 2024-11-06 13:38:16 +01:00
aignatov-bio
533ab2253d
Merge pull request #8017 from aignatov-bio/ai-sci-unify-docx-native-tables-logic
Unify docx native tables logic
2024-11-05 15:35:03 +01:00
Anton
82fa979ac5 Unify docx native table logic 2024-11-05 14:26:16 +01:00
Anton
dc08c850d8 Merge branch 'features/native-tables-revamp' of github.com:scinote-eln/scinote-web into features/native-tables-revamp 2024-11-05 13:15:03 +01:00
Anton
96473cdac1 Merge branch 'develop' into features/native-tables-revamp 2024-11-05 13:14:34 +01:00
aignatov-bio
8e0be4850f
Merge pull request #8016 from aignatov-bio/ai-sci-move-protocol-print-table-to-partial
Move protocol print table to partial
2024-11-05 11:26:49 +01:00
Anton
f594d48996 Move protocol print table to partial 2024-11-05 11:23:10 +01:00
andrej-scinote
458e8b9a86
Merge pull request #8015 from andrej-scinote/aj_SCI_11240
Change link in activities for protocols [SCI-11240]
2024-11-05 10:59:15 +01:00
Andrej
d0877c7d15 Change link in activities for protocols [SCI-11240] 2024-11-05 10:56:08 +01:00
Andrej
4fb54535ad Merge branch 'features/protocol-template-renaming' into develop 2024-11-05 10:34:14 +01:00
andrej-scinote
9fbfb7f05c
Merge pull request #7996 from andrej-scinote/aj_SCI_11185
Create snapshot provisioning immediately when the task is locked [SCI-11185]
2024-11-05 10:32:53 +01:00
aignatov-bio
04363fa539
Merge pull request #8014 from aignatov-bio/ai-sci-add-new-icons
Add new icons
2024-11-04 16:00:10 +01:00
Anton
c07203c4b4 Add new icons 2024-11-04 15:52:23 +01:00
Martin Artnik
c71e3780f5
Merge pull request #8013 from artoscinote/ma_SCI_11238
Fix repository asset permission checks [SCI-11238]
2024-11-04 15:15:21 +01:00
Martin Artnik
f083806abc
Merge pull request #8012 from artoscinote/ma_SCI_11227
Fix generation of docx report preview [SCI-11227]
2024-11-04 15:11:32 +01:00
Martin Artnik
0a4ddb8038 Fix repository asset permission checks [SCI-11238] 2024-11-04 15:10:28 +01:00
Martin Artnik
53b60a6b1e Fix generation of docx report preview [SCI-11227] 2024-11-04 13:54:18 +01:00
aignatov-bio
9a82e74e12
Merge pull request #8011 from aignatov-bio/ai-sci-11231-add-vue-component-for-tables-report
Add vue component for tables report [SCI-11231]
2024-11-04 11:50:53 +01:00
andrej-scinote
2bb695a17f
Merge pull request #8010 from andrej-scinote/aj_SCI_11236
Fix image preview if an image is deleted immediately  [SCI-11236]
2024-11-04 11:19:37 +01:00
Anton
fc58728375 Add vue component for tables report [SCI-11231] 2024-11-04 11:03:41 +01:00
Andrej
96d5176bf1 Fix image preview if image is delete immediately [SCI-11236] 2024-11-04 10:57:14 +01:00
Martin Artnik
9a92820e11
Merge pull request #8009 from artoscinote/ma_SCI_11230
Clone file version history when making new protocol draft [SCI-11230]
2024-10-30 15:36:33 +01:00
Martin Artnik
d3292f6c4a Clone file version history when making new protocol draft [SCI-11230] 2024-10-30 15:23:48 +01:00
andrej-scinote
f93855ef9e
Merge pull request #8007 from andrej-scinote/aj_SCI_11228
Fix adding of well plates from the step toolbar [SCI-11228]
2024-10-30 13:07:21 +01:00
aignatov-bio
c12abc62ea
Merge pull request #8008 from aignatov-bio/ai-sci-11235-fixes-for-notifications
Fixes for notifications improvements [SCI-11235]
2024-10-30 12:45:31 +01:00
Anton
649a8abe66 Fixes for notifications improvment [SCI-11235] 2024-10-30 11:44:30 +01:00
Andrej
19c8c7c504 Fix adding of well plates from step toolbar [SCI-11228] 2024-10-30 11:41:19 +01:00
andrej-scinote
004745d4e7
Merge pull request #8004 from andrej-scinote/aj_SCI_10851
Remove constraint for the protocol template name [SCI-10851]
2024-10-30 09:07:17 +01:00
Martin Artnik
89bc4102ee
Merge pull request #8005 from artoscinote/ma_SCI_11198
Add file delete confirmation modal to item sidebar [SCI-11198]
2024-10-29 21:03:11 +01:00
Martin Artnik
ba45068807 Add file delete confirmation modal to item sidebar [SCI-11198] 2024-10-29 16:41:31 +01:00
Andrej
d707f9121c Remove constraint for the protocol template name [SCI-10851] 2024-10-29 15:12:27 +01:00
dependabot[bot]
1283632e33
Bump elliptic from 6.5.7 to 6.6.0 (#8001)
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.7 to 6.6.0.
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.7...v6.6.0)

---
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>
2024-10-29 13:25:13 +01:00
aignatov-bio
7e75bacfba
Merge pull request #8003 from aignatov-bio/ai-sci-update-icon-font
Update icon font
2024-10-29 10:47:34 +01:00
Anton
0e0d99854f Update icon font 2024-10-29 10:30:05 +01:00
Martin Artnik
2af9ab7f5d
Merge pull request #8002 from artoscinote/ma_SCI_11041
Enable file editing for inventory files [SCI-11041]
2024-10-29 10:22:30 +01:00
Martin Artnik
b6ed204aa0
Merge pull request #7997 from artoscinote/ma_SCI_11218
UI fixes for File versions modal [SCI-11218]
2024-10-29 10:22:17 +01:00
Martin Artnik
c6a4e71d69 Enable file editing for inventory files [SCI-11041] 2024-10-29 09:56:03 +01:00
Martin Artnik
480754d3d4 Fix date format in file versions modal [SCI-11223] 2024-10-29 09:43:11 +01:00
dependabot[bot]
0b7705f95f
Bump rexml from 3.3.7 to 3.3.9 (#7998)
Bumps [rexml](https://github.com/ruby/rexml) from 3.3.7 to 3.3.9.
- [Release notes](https://github.com/ruby/rexml/releases)
- [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md)
- [Commits](https://github.com/ruby/rexml/compare/v3.3.7...v3.3.9)

---
updated-dependencies:
- dependency-name: rexml
  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-29 09:38:46 +01:00
Martin Artnik
aae0abcd67 UI fixes for File versions modal [SCI-11218] 2024-10-28 15:03:05 +01:00
Andrej
9b0521a168 Create snapshot provisioning immediatelly when task is locked [SCI-11185] 2024-10-28 13:55:07 +01:00