scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-19 15:41:30 +08:00
Code Issues Projects Releases Packages Wiki Activity
16228 commits 31 branches 181 tags 166 MiB
Commit graph

16228 commits

This branch
This branch
All branches
Author SHA1 Message Date
ajugo
939d31b642
Fix loading archived status for item card relations [SCI-9910] (#6944) 2024-01-15 13:04:23 +01:00
Martin Artnik
bd1e2696c1
Merge pull request #6938 from lasniscinote/gl_SCI_10008 
(fix) Modal opened behind the item card [SCI-10008]
 2024-01-15 12:52:00 +01:00
Gregor Lasnibat
7b1a31eaf3 (fix) Modal opened behind the item card [SCI-10008] 2024-01-15 12:09:47 +01:00
ajugo
701c4c2f86
Fix unlinkind relationship connections [SCI-9912] (#6942) 2024-01-15 12:03:09 +01:00
Martin Artnik
ef5f822af2 Merge branch 'develop' into features/asset-sync 2024-01-15 11:57:03 +01:00
ajugo
566decd9ed
Inventory relationship fixes [SCI-10005] (#6941) 2024-01-15 11:08:08 +01:00
ajugo
f39e9501cf
Removed proxing of API V1 endpoints to the new V2 namespace [SCI-9976] (#6943) 2024-01-15 10:01:51 +01:00
Martin Artnik
424da0a218
Merge pull request #6939 from G-Chubinidze/gc_SCI_9987 
Make File Checkout feature switchable in settings [SCI-9987]
 2024-01-15 09:44:37 +01:00
ajugo
98ee391d03
Filter already connected items on repository item relationship modal [SCI-9916] (#6934) 2024-01-15 09:41:52 +01:00
ajugo
81fbd38b0c
Increase timeout for PDF generation in Grover config [SCI-9969] (#6937) 2024-01-15 09:38:22 +01:00
Giga Chubinidze
4e29b4dab8 Add Settings link to Notifications modal [SCI-9986] 2024-01-15 05:03:18 +04:00
Giga Chubinidze
aa47cbad95 Make File Checkout feature switchable in settings [SCI-9987] 2024-01-15 04:43:00 +04:00
aignatov-bio
427f7a7b2e
Merge pull request #6935 from aignatov-bio/ai-sci-9984-add-infinite-scroll 
Add infinite scrolling to new tables [SCI-9984]
 2024-01-12 14:53:59 +01:00
aignatov-bio
0fe7c040a1
Merge pull request #6930 from aignatov-bio/ai-sci-9985-add-sorting-to-cards 
Add sorting to cards view [SCI-9985]
 2024-01-12 14:53:49 +01:00
Anton
3bcd40d64e Add infinite scrolling to new tables [SCI-9984] 2024-01-12 14:45:46 +01:00
Martin Artnik
8476419ba1
Merge pull request #6933 from sboursen-scinote/sb_SCI-9673-force-quotes 
Force quoting of CSV fields for repository export [SCI-9673]
 2024-01-12 13:43:55 +01:00
Martin Artnik
03f3c3063f
Merge pull request #6919 from lasniscinote/gl_SCI_9964 
(fix) Deactivate the Items dropdown until the Inventory is chosen [SCI-9964]
 2024-01-12 13:37:29 +01:00
Martin Artnik
0a07325e67
Merge pull request #6923 from ivanscinote/SCI-9974-ik2 
Keep attachment thumbnail menu open when mouse moves out [SCI-9974]
 2024-01-12 13:37:00 +01:00
Martin Artnik
5251218030
Merge pull request #6929 from lasniscinote/gl_SCI_9973 
(fix) Update the multiselect dropdown color switch step 2 [SCI-9973]
 2024-01-12 13:35:44 +01:00
Martin Artnik
71c58e3769
Merge pull request #6932 from sboursen-scinote/sb_SCI-9992 
Duplicated edit activities when creating a table/well plate [SCI-9992]
 2024-01-12 11:21:29 +01:00
sboursen-scinote
a55f79e4e4 Force quoting of csv fields for repository export [SCI-9673] 2024-01-12 10:38:37 +01:00
Martin Artnik
bd0cfda142
Merge pull request #6931 from G-Chubinidze/gc_SCI_9962_9760 
Improvements of the SciNote Edit option in "Add-ons" [SCI-9962][SCI-9760]
 2024-01-12 09:25:43 +01:00
Giga Chubinidze
5250bade57 hound fix 2024-01-12 03:16:10 +04:00
Giga Chubinidze
83a2657bd1 Improvements of the SciNote Edit option in "Add-ons" [SCI-9962][SCI9760] 2024-01-12 03:10:11 +04:00
Anton
58bd01091b Add sorting to cards view [SCI-9985] 2024-01-11 17:42:17 +01:00
sboursen-scinote
085918ca92 Prevent double edit activities when creating a table/well plate [SCI-9992] 2024-01-11 15:56:19 +01:00
Anton
5eaae54e77 Fix merge conflicts 2024-01-11 15:40:03 +01:00
Anton
7233f4c8ab Merge branch 'features/new-datatable' of github.com:scinote-eln/scinote-web into features/new-datatable 2024-01-11 15:27:10 +01:00
aignatov-bio
37919d8346
Merge pull request #6926 from aignatov-bio/ai-sci-9803-replace-reports-table 
Replace reports table [SCI-9803]
 2024-01-11 15:26:52 +01:00
Anton
707042adc7 Merge branch 'features/new-datatable' of github.com:scinote-eln/scinote-web into features/new-datatable 2024-01-11 15:16:08 +01:00
Anton
de72f60cc1 Merge branch 'develop' into features/new-datatable 2024-01-11 15:14:36 +01:00
Gregor Lasnibat
197c3fb9b3 (fix) Deactivate the Items dropdown until the Inventory is chosen [SCI-9964] 2024-01-11 13:06:14 +01:00
Gregor Lasnibat
a7f332e630 (fix) Update the multiselect dropdown color switch step 2 [SCI-9973] 2024-01-11 11:59:08 +01:00
Gregor Lasnibat
a38c2457a9
(fix) Selected items are incorrect on relationship modal [9965] (#6924) 2024-01-11 11:49:18 +01:00
ajugo
b5d20b13c4
Remove relationship section for snapshot item cards [SCI-9963] (#6913) 2024-01-11 11:44:14 +01:00
Gregor Lasnibat
7e3b6beafe
(fix) Can not add text/number to item card from task assigned item table [SCI-9834] (#6916) 2024-01-11 11:35:45 +01:00
dependabot[bot]
4f21817b00
Bump follow-redirects from 1.15.2 to 1.15.4 (#6922) 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.2 to 1.15.4.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.2...v1.15.4)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-01-11 11:29:25 +01:00
Martin Artnik
3134104a92
Merge pull request #6927 from ivanscinote/SCI-9862-ik 
Handle Windows not having an appropriate app for SciNote Edit [SCI-9862]
 2024-01-11 11:05:14 +01:00
Ivan Kljun
22b7424884 Handle Windows not having an appropriate app for SciNote Edit [SCI-9862] 2024-01-11 10:41:11 +01:00
Anton
62edf89699 Replace reports table [SCI-9803] 2024-01-11 10:06:39 +01:00
ajugo
4fe3fe5167
Change default value for table metadata [SCI-9932] (#6894) 2024-01-10 17:28:14 +01:00
wandji
e31448c8e7
Add archived label for inventories and item in item card relationships and modal [SCI-9122] (#6884) 2024-01-10 17:23:15 +01:00
Oleksii Kriuchykhin
3b97571777 Merge branch 'features/inventory-items-relationships' into develop 2024-01-10 17:10:20 +01:00
Martin Artnik
21b3c2a65f Merge branch 'develop' into features/new-datatable 2024-01-10 16:31:53 +01:00
Martin Artnik
7a4d17f63e Merge branch 'develop' into features/asset-sync 2024-01-10 16:31:21 +01:00
Ivan Kljun
01c2a602d0 Keep attachment thumbnail menu open when mouse moves out [SCI-9974] 2024-01-10 15:54:10 +01:00
Gregor Lasnibat
7a3c6084b1
(fix) Item card minor issue [SCI-9814_v2] (#6920) 2024-01-10 15:32:31 +01:00
Soufiane
a7dd9d49b2
Add links to items in linked/unlinked related activities [SCI-9718] (#6921) 2024-01-10 15:32:01 +01:00
dependabot[bot]
7b49db6ff9
Bump puma from 6.3.1 to 6.4.2 (#6904) 
Bumps [puma](https://github.com/puma/puma) from 6.3.1 to 6.4.2.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v6.3.1...v6.4.2)

---
updated-dependencies:
- dependency-name: puma
  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-01-10 13:05:18 +01:00
Oleksii Kriuchykhin
00e6ae3252 Merge branch 'develop' 2024-01-10 10:46:01 +01:00