scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity
17201 commits 69 branches 179 tags 165 MiB
Commit graph

17201 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ajugo 9a05c154d0
Merge pull request #7663 from aignatov-bio/ai-sci-10808-exclude-default-columns-from-automapping 
Exclude default columns from mapping [SCI-10808]
 2024-06-27 10:43:49 +02:00
ajugo fba04d401d
Merge pull request #7661 from aignatov-bio/ai-sci-10791-fix-css-inventoyry-import 
Small fixes for inventory import [SCI-10797][SCI-10791]
 2024-06-27 10:42:18 +02:00
Alex Kriuchykhin ad93fffed7
Fix password generation with increased minimum user password length [SCI-10821] (#7664) 2024-06-26 15:41:42 +02:00
Anton 32c8af1280 Exclude default columns from mapping [SCI-10808] 2024-06-26 15:24:29 +02:00
aignatov-bio 759234aad1
Merge pull request #7662 from aignatov-bio/ai-sci-10432-fix-activities-for-deleted-results 
Add discarded to results [SCI-10432]
 2024-06-26 13:48:16 +02:00
Anton 3476271afd Add discarded to results [SCI-10432] 2024-06-26 13:37:00 +02:00
Martin Artnik cb2f0b1bcd Merge branch 'release/1.30.0' 2024-06-26 11:42:17 +02:00
Martin Artnik 2452f4c239 Bump version to 1.30.0.4 2024-06-26 11:38:55 +02:00
Martin Artnik 3075df6771 Fix MarvinJS init for remote/local/disabled cases [SCI-10815] 2024-06-26 11:36:32 +02:00
Anton 323e40dd2e Small fixes for inventory import [SCI-10797][SCI-10791] 2024-06-24 13:22:57 +02:00
aignatov-bio 6cd68e6c09
Merge pull request #7660 from aignatov-bio/ai-sci-10801-fix-cells-preview-mapping 
Fix cells preview mapping [SCI-10801]
 2024-06-21 12:23:15 +02:00
Anton bf47729db1 Fix cells preview mapping [SCI-10801] 2024-06-21 12:19:39 +02:00
aignatov-bio e1a8d7fa13
Merge pull request #7659 from aignatov-bio/ai-sci-10806-fix-tootip-on-experiment-name 
Fix tooltips on experiment name [SCI-10806]
 2024-06-21 12:14:20 +02:00
Anton 2706045111 Fix tooltips on experiment name [SCI-10806] 2024-06-21 11:58:46 +02:00
Martin Artnik 4e4db1aca4 Merge branch 'release/1.30.0' into develop 2024-06-21 11:46:00 +02:00
Oleksii Kriuchykhin 9f4f697e03 Bump version to 1.30.0.3 2024-06-21 11:18:15 +02:00
Alex Kriuchykhin 89ded1f0f9
Add configuration parameter defining password min length through env variable PASSWORD_MIN_LENGTH (#7657) 2024-06-21 10:51:20 +02:00
Alex Kriuchykhin 3cb610280d
Fix marvinjs initialization for local marvinjs setup (#7656) 
Co-authored-by: Martin Artnik <martin@scinote.net>
 2024-06-21 10:40:36 +02:00
aignatov-bio 73a5a6973f
Merge pull request #7655 from aignatov-bio/ai-sci-10803-fix-title-on-protocol-toolbar 
Fix title on protocol toolbar [SCI-10803]
 2024-06-20 14:08:54 +02:00
Anton 1f8068cfa1 Fix title on protocol toolbar [SCI-10803] 2024-06-20 14:06:35 +02:00
aignatov-bio 56f11cdeba
Merge pull request #7654 from aignatov-bio/ai-sci-10804-fix-attachment-section 
Fix atachment section [SCI-9884][SCI-10804][SCI-10805]
 2024-06-20 11:51:14 +02:00
Anton 062ea4e3da Fix atachment section [SCI-9884][SCI-10804][SCI-10805] 2024-06-20 11:48:35 +02:00
aignatov-bio 1c573cfd62
Merge pull request #7648 from rekonder/aj_SCI_10792 
Remove export limit for repository export [SCI-10792]
 2024-06-19 17:15:41 +02:00
aignatov-bio e92d5064f9
Merge pull request #7647 from rekonder/aj_SCI_10448 
Disable duplicate repository for shared repository [SCI-10448]
 2024-06-19 17:14:45 +02:00
aignatov-bio 57b39d81a6
Merge pull request #7634 from aignatov-bio/ai-sci-10261-make-protocol-toolbar-responsive 
Make protocol toolbar responsive [SCI-10261]
 2024-06-19 17:14:16 +02:00
aignatov-bio 53a68b4b24
Merge branch 'features/inventory-import-improvements' into ai-sci-10261-make-protocol-toolbar-responsive 2024-06-19 17:13:52 +02:00
ajugo 7f4a88b3aa
Merge pull request #7651 from rekonder/aj_SCI_10786 
Fix opening of wopi files with extensions written in upper case [SCI-10786]
 2024-06-19 14:01:16 +02:00
Andrej 3733aa3b7e Fix opening of wopi files with extensions written in upper case [SCI-10786] 2024-06-19 13:25:28 +02:00
aignatov-bio eeaf073ced
Merge pull request #7650 from aignatov-bio/ai-sci-8865-small-fix-for-task-creation 
Fix select dropdown changes [SCI-8865]
 2024-06-18 15:57:19 +02:00
Anton 967178654e Fix select dropdown changes [SCI-8865] 2024-06-18 15:52:10 +02:00
aignatov-bio e67f7c8caf
Merge pull request #7645 from rekonder/aj_SCI_10730 
Log activity for content reordering only when order change [SCI-10730]
 2024-06-18 14:43:32 +02:00
aignatov-bio 36248d106f
Merge pull request #7649 from aignatov-bio/ai-sci-10613-update-wording-and-add-titles 
Fix wording and titles [SCI-10613][SCI-10789][SCI-10796]
 2024-06-18 14:42:40 +02:00
Anton af13131549 Fix wording and titles [SCI-10613][SCI-10789][SCI-10796] 2024-06-18 12:58:11 +02:00
aignatov-bio 6528a5af80
Merge pull request #7646 from aignatov-bio/ai-sci-10790-remove-success-step 
Remove success step from inventory import [SCI-10790]
 2024-06-18 11:19:11 +02:00
Andrej e55703ff70 Remove export limit for repository export [SCI-10792] 2024-06-17 16:02:23 +02:00
Andrej 1bdb6358f1 Disable duplicate repository for shared repository [SCI-10448] 2024-06-17 14:29:31 +02:00
aignatov-bio e70027e8c2
Merge pull request #7644 from KlemenSciNote/kb_SCI-10787_fix-inventory-item-filters-data-e2e 
e2e - Fix data-e2e attributes [SCI-10787]
 2024-06-17 13:35:20 +02:00
aignatov-bio 758a0f295d
Merge pull request #7638 from aignatov-bio/ai-sci-10772-hide-system-default-columns 
Remove default columns from available selection [SCI-10772]
 2024-06-17 13:34:53 +02:00
aignatov-bio a87bbc096f
Merge branch 'features/inventory-import-improvements' into ai-sci-10772-hide-system-default-columns 2024-06-17 13:34:46 +02:00
Anton de51687641 Remove success step from inventory import [SCI-10790] 2024-06-17 13:33:04 +02:00
Andrej 873a70e425 Log activity for content reordering only when order change [SCI-10730] 2024-06-17 12:52:48 +02:00
aignatov-bio df5a414bf5
Merge pull request #7640 from aignatov-bio/ai-sci-10773-fixed-import-mapping 
Fix preview statuses for inventory import [SCI-10788]
 2024-06-17 10:35:22 +02:00
Anton 68b4df7ec5 Fix unexisting rows and cell deletion [SCI-10773] 2024-06-14 15:49:17 +02:00
Anton fbf311e25d Fix repository import mapping and preview [SCI-10773] 2024-06-14 14:51:32 +02:00
Anton 3054a3c4ec Merge branch 'develop' into features/inventory-import-improvements 2024-06-14 14:50:05 +02:00
Klemen Benedicic 2d28aa4144 Merge branch 'develop' into kb_SCI-10787_fix-inventory-item-filters-data-e2e 2024-06-13 12:09:26 +02:00
Klemen Benedicic 05da43f60a Fixed inventory item filter data-e2e. [SCI-10787] 2024-06-13 12:07:24 +02:00
dependabot[bot] cc6d79a69d
Bump braces from 3.0.2 to 3.0.3 (#7641) 
Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-06-12 16:56:04 +02:00
dependabot[bot] 2e92d6b39c
Bump postcss from 8.4.31 to 8.4.32 (#7621) 
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.31 to 8.4.32.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.31...8.4.32)

---
updated-dependencies:
- dependency-name: postcss
  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-06-12 15:19:52 +02:00
dependabot[bot] 5084af9329
Bump actionpack from 7.0.8.1 to 7.0.8.4 (#7628) 
Bumps [actionpack](https://github.com/rails/rails) from 7.0.8.1 to 7.0.8.4.
- [Release notes](https://github.com/rails/rails/releases)
- [Changelog](https://github.com/rails/rails/blob/v7.1.3.4/actionpack/CHANGELOG.md)
- [Commits](https://github.com/rails/rails/compare/v7.0.8.1...v7.0.8.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-06-12 15:18:56 +02:00