scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-30 00:45:28 +08:00
Code Issues Projects Releases Packages Wiki Activity
17430 commits 90 branches 195 tags 173 MiB
Commit graph

17430 commits

This branch
This branch
All branches
Author SHA1 Message Date
aignatov-bio
fb0e73bf80
Merge pull request #7831 from aignatov-bio/ai-sci-11009-fix-xss-on-table-task-name 
Fix task table name renderer [SCI-11009]
 2024-09-05 13:02:11 +02:00
Anton
c641e6b552 Fix task table name renderer [SCI-11009] 2024-09-05 12:17:57 +02:00
Martin Artnik
e57dc3d213 Fix shared objects for different repository types [SCI-10865] 2024-09-04 14:04:56 +02:00
Martin Artnik
c895047114 Remove unused permission helpers [SCI-10865] 2024-09-04 13:36:12 +02:00
aignatov-bio
23d8909a85
Merge pull request #7829 from aignatov-bio/ai-sci-11010-add-blacklist-for-executables 
Add restricted extensions for scinote edit [SCI-11010]
 2024-09-04 11:30:00 +02:00
Anton
e5196774fd Add restricted extensions for scinote edit [SCI-11010] 2024-09-04 11:10:03 +02:00
Martin Artnik
5ba07aec28 Implement storage location sharing logic and permissions [SCI-10865] 2024-09-03 15:50:10 +02:00
aignatov-bio
28810ed1f5
Merge pull request #7826 from aignatov-bio/ai-sci-11009-move-table-renderers-to-components 
Move table renderers to components [SCI-11009]
 2024-09-03 13:27:10 +02:00
Anton
f8fd07695f Move table renderers to components [SCI-11009] 2024-09-03 13:22:57 +02:00
dependabot[bot]
e42a99d2af
Bump axios from 1.7.2 to 1.7.4 (#7803) 
Bumps [axios](https://github.com/axios/axios) from 1.7.2 to 1.7.4.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v1.7.2...v1.7.4)

---
updated-dependencies:
- dependency-name: axios
  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-09-02 13:45:46 +02:00
dependabot[bot]
a0011c6ee1
Bump rexml from 3.3.3 to 3.3.6 (#7812) 
Bumps [rexml](https://github.com/ruby/rexml) from 3.3.3 to 3.3.6.
- [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.3...v3.3.6)

---
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-09-02 13:45:15 +02:00
Alex Kriuchykhin
c8af20a822
Restrict ActiveStorage previews format to only PNG or JPEG [SCI-10969] (#7810) 2024-09-02 13:44:57 +02:00
dependabot[bot]
c78dc20c0f
Bump webpack from 5.77.0 to 5.94.0 (#7824) 
Bumps [webpack](https://github.com/webpack/webpack) from 5.77.0 to 5.94.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.77.0...v5.94.0)

---
updated-dependencies:
- dependency-name: webpack
  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-09-02 13:44:24 +02:00
Martin Artnik
c0d386f0c1 Merge branch 'develop' into features/storage-locations 2024-08-30 13:28:19 +02:00
Martin Artnik
88462de1d5
Merge pull request #7823 from scinote-eln/develop 
Shared task fixes
 2024-08-28 12:06:41 +02:00
Martin Artnik
8a7ac76085
Merge pull request #7821 from artoscinote/ma_SCI_11007 
Fix shared task assigned items [SCI-11007]
 2024-08-28 11:47:45 +02:00
Martin Artnik
efe19a776e Fix shared task assigned items [SCI-11007] 2024-08-28 11:42:30 +02:00
Martin Artnik
83642d1655
Merge pull request #7820 from artoscinote/ma_SCI_11007 
Fix shared tasks [SCI-11007]
 2024-08-28 11:22:27 +02:00
Martin Artnik
2ebb88c300 Fix shared tasks [SCI-11007] 2024-08-28 11:19:27 +02:00
Martin Artnik
4f3b6f7959
Merge pull request #7819 from scinote-eln/develop 
August 2024 Technical Release
 2024-08-27 16:50:15 +02:00
Martin Artnik
f717f43b9b
Bump version to 1.36.2 2024-08-27 16:48:53 +02:00
Martin Artnik
6260ca7a7c
Merge pull request #7818 from artoscinote/ma_SCI_11005 
Fix project export permission checks [SCI-11005]
 2024-08-27 14:32:48 +02:00
Martin Artnik
e4e547aa6d Fix project export permission checks [SCI-11005] 2024-08-27 14:21:02 +02:00
Martin Artnik
40355ae6c8 Generalize team sharing logic, implement sharing for storage locations [SCI-10865] 2024-08-27 13:31:50 +02:00
Martin Artnik
0581931ad9 Merge branch 'develop' into features/storage-locations 2024-08-27 13:18:04 +02:00
Martin Artnik
bcd124df51
Merge pull request #7816 from artoscinote/ma_SCI_11004 
Update mapping step selections once an item is selected [SCI-11004]
 2024-08-27 11:29:44 +02:00
Martin Artnik
726b1973f1 Update mapping step selections once an item is selected [SCI-11004] 2024-08-27 11:20:46 +02:00
Martin Artnik
ff0a5e3b2a
Merge pull request #7814 from artoscinote/ma_SCI_11000 
Fix deleted result activities, experiment activity permission checks, dashboard permission checks [SCI-11000]
 2024-08-26 12:53:50 +02:00
Martin Artnik
64f7f1bad4 Fix deleted result activities, experiment activity permission checks, dashboard permission checks [SCI-11000] 2024-08-26 12:07:13 +02:00
Martin Artnik
a85fc77261 Merge branch 'develop' into features/storage-locations 2024-08-26 11:12:04 +02:00
Martin Artnik
8ba8e3b2c8
Merge pull request #7813 from artoscinote/ma_SCI_11000 
Fix activity permission checks [SCI-11000]
 2024-08-26 10:57:52 +02:00
Martin Artnik
a957e2e442 Simplify activity queries [SCI-11000] 2024-08-26 10:54:24 +02:00
Martin Artnik
74e6d5074e Fix permission check for protocol template activities [SCI-11000] 2024-08-26 10:12:54 +02:00
Martin Artnik
6b5a5cddf8 Fix task activity permission checks [SCI-11000] 2024-08-26 09:48:10 +02:00
Martin Artnik
a0d74b629c
Merge pull request #7811 from scinote-eln/features/repository-permissions-rework 
Features/repository permissions rework
 2024-08-22 10:43:27 +02:00
Martin Artnik
e7b4fd0151
Merge pull request #7809 from artoscinote/ma_SCI_10988 
Properly handle experiments with hidden tasks in navigator [SCI-10988]
 2024-08-21 11:09:35 +02:00
ajugo
b380a009d8
Merge pull request #7808 from rekonder/aj_SCI_10997 
Fix inventory item counter on inventory page [SCI-10997]
 2024-08-21 11:09:16 +02:00
Martin Artnik
531cdbf23c Properly handle experiments with hidden tasks in navigator [SCI-10988] 2024-08-21 11:06:02 +02:00
Andrej
dd42485cd4 Fix inventory item counter on inventory page [SCI-10997] 2024-08-20 17:28:53 +02:00
ajugo
59ca89fce1
Merge pull request #7807 from rekonder/aj_SCI_10995 
Fix collapsing of results [SCI-10995]
 2024-08-20 16:41:24 +02:00
Andrej
7e0cd6bd10 Fix collapsing of results [SCI-10995] 2024-08-20 16:26:32 +02:00
dependabot[bot]
5ff3dad416
Bump elliptic from 6.5.4 to 6.5.7 (#7804) 
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.4 to 6.5.7.
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.4...v6.5.7)

---
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-08-20 14:54:31 +02:00
Alex Kriuchykhin
e561594a47
Fix permissions checking user assignments scopes [SCI-10991] (#7805) 2024-08-20 14:47:32 +02:00
Martin Artnik
3c877625ed
Merge pull request #7802 from okriuchykhin/ok_SCI_10991_v2 
Fix listing of globally shared inventories [SCI-10991]
 2024-08-20 12:15:51 +02:00
dependabot[bot]
ff30b5b669
Bump fugit from 1.8.1 to 1.11.1 (#7801) 
Bumps [fugit](https://github.com/floraison/fugit) from 1.8.1 to 1.11.1.
- [Changelog](https://github.com/floraison/fugit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/floraison/fugit/compare/v1.8.1...v1.11.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-08-20 11:29:09 +02:00
Oleksii Kriuchykhin
0cd2493f8b Fix listing of globally shared inventories [SCI-10991] 2024-08-20 11:26:57 +02:00
Martin Artnik
512b03a48b
Merge pull request #7800 from okriuchykhin/ok_SCI_10991 
Fix inventory activities listing, fix inventory viewable_by_user scope, fix inventory fetching in reports [SCI-10991][SCI-10994]
 2024-08-19 18:00:43 +02:00
Oleksii Kriuchykhin
9eee05f906 Fix inventory activities listing, fix inventory viewable_by_user scope, fix inventory fetching in reports [SCI-10991][SCI-10994] 2024-08-19 17:37:04 +02:00
Martin Artnik
495618abe4 Merge branch 'develop' into features/repository-permissions-rework 2024-08-14 15:06:18 +02:00
Martin Artnik
83057e7c5e
Merge pull request #7798 from scinote-eln/develop 
August 2024 Release
 2024-08-14 09:29:07 +02:00