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
16329 commits 69 branches 179 tags 165 MiB
Commit graph

16329 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ivan Kljun 8cd28e3aa6 Merge remote-tracking branch 'upstream/features/inventory-import-improvements' into SCI-10256-ik 2024-03-28 11:32:21 +01:00
Martin Artnik bd3968c4a6
Merge pull request #7233 from artoscinote/ma_SCI_10257 
Add duplicate asset functionality [SCI-10257]
 2024-03-28 09:54:32 +01:00
Martin Artnik ea4c356e10 Add file duplicate activities [SCI-10257] 2024-03-28 09:52:58 +01:00
Ivan Kljun 580f67dbf1 Refactor method for renaming attached files [SCI-10256] 2024-03-28 08:46:40 +01:00
Martin Artnik 7c92d9beba Add duplicate asset functionality [SCI-10257] 2024-03-27 12:56:45 +01:00
Ivan Kljun 7366134fe3 Merge remote-tracking branch 'upstream/features/inventory-import-improvements' into SCI-10256-ik 2024-03-26 15:28:09 +01:00
Gregor Lasnibat 8ecef3719c
Merge pull request #7278 from lasniscinote/gl_SCI_10398 
(dev) Skip archived items and items not in the current inventory when importing an inventory [SCI-10398]
 2024-03-25 13:08:16 +01:00
Gregor Lasnibat 411a182f25
Merge pull request #7291 from lasniscinote/gl_SCI_10399 
(dev) Detect duplicated item IDs when parsing a spreadsheet [SCI-10399]
 2024-03-25 13:03:44 +01:00
Gregor Lasnibat 640f3168bc (dev) Detect duplicated item IDs when parsing a spreadsheet [SCI-10399] 2024-03-25 11:52:53 +01:00
Martin Artnik 167d57b3d1
Merge pull request #7328 from lasniscinote/gl_SCI_10313 
(fix) Improve the appearance of List view in File attachments [SCI-10313]
 2024-03-25 10:23:02 +01:00
Martin Artnik 6b4ae0e59a Merge branch 'develop' into features/inventory-import-improvements 2024-03-25 10:20:13 +01:00
Ivan Kljun 2214469f80 Merge remote-tracking branch 'upstream/features/inventory-import-improvements' into SCI-10256-ik 2024-03-25 10:04:49 +01:00
G-Chubinidze 0d4d768361
Return results counter to the Result tab [SCI-10282] (#7306) 2024-03-22 10:23:38 +01:00
Gregor Lasnibat 977b8e7ded (fix) Improve the appearance of List view in File attachments [SCI-10313] 2024-03-21 20:03:50 +01:00
Martin Artnik f571ec5c0c
Merge pull request #7338 from lasniscinote/gl_SCI_10314 
(fix) Improve the appearance of Large view in File attachments [SCI-10314]
 2024-03-21 10:44:10 +01:00
Ivan Kljun a5eda08cf2 Enable renaming attached files [SCI-10256] 2024-03-21 10:38:27 +01:00
Gregor Lasnibat a75d0551fc (fix) Improve the appearance of Large view in File attachments [SCI-10314] 2024-03-21 08:53:13 +01:00
aignatov-bio 307db56712
Merge pull request #7341 from sboursen-scinote/sb_SCI-10497 
Fix action toolbar visibility in card views [SCI-10497]
 2024-03-20 20:28:06 +01:00
aignatov-bio 90ffd83385
Merge pull request #7339 from wandji20/wb-SCI-10441 
Hide last pinned column resizer on grid ready and columns reset [SCI-10441]
 2024-03-20 20:26:01 +01:00
aignatov-bio e5bfea3173
Merge pull request #7334 from wandji20/wb-SCI-10495 
Fix css dropdown and primary button disabled state [SCI-10495]
 2024-03-20 20:25:09 +01:00
sboursen-scinote 7c619115ea Fix action toolbar visibility in card views [SCI-10497] 2024-03-20 19:11:52 +01:00
wandji20 d1cf506ad8 Unify disabled styles for primary and secondary buttons [SCI-10495] 2024-03-20 17:54:14 +01:00
wandji20 a4de15a863 Fix css dropdown and primary button disabled state SCI-[10495] 2024-03-20 17:51:06 +01:00
ajugo e87a4ad469
Merge pull request #7340 from rekonder/aj_SCI_10492 
Fix tests after consumption fixes [SCI-10492]
 2024-03-20 17:48:44 +01:00
Andrej 4156eb33b9 Fix tests after consumption fixes [SCI-10492] 2024-03-20 17:12:55 +01:00
wandji20 516ccbb57d Hide last pinned column resizer on grid ready and columns reset [SCI-10441] 2024-03-20 16:42:57 +01:00
aignatov-bio ea22a3f23e
Merge pull request #7336 from wandji20/wb-SCI-10455 
Pre-select current user in new task designated user dropdown [SCI-10455]
 2024-03-20 16:15:12 +01:00
aignatov-bio b1e16b1b8f
Merge pull request #7335 from sboursen-scinote/sb_SCI-10482 
Fix folder visibility in navigator [SCI-10482]
 2024-03-20 16:14:17 +01:00
aignatov-bio 574ce111c1
Merge pull request #7330 from aignatov-bio/ai-sci-10484-fix-stock-modal 
Fix stock modal [SCI-10484]
 2024-03-20 16:02:14 +01:00
aignatov-bio 1814713453
Merge pull request #7324 from wandji20/wb-SCI-10374 
Css Fix experiment card [SCI-10374]
 2024-03-20 16:02:01 +01:00
wandji20 366bd7201f Preselect current user in new task designated user dropdown [SCI-10455] 2024-03-20 15:51:51 +01:00
sboursen-scinote 9dca8e7c4b Fix folder visibility in navigator [SCI-10482] 2024-03-20 15:44:13 +01:00
Martin Artnik c628fc5175
Merge pull request #7332 from rekonder/aj_SCI_10492 
Fix stock ledger user recording [SCI-10492]
 2024-03-20 13:02:52 +01:00
Andrej df8a71549d Fix stock ledger user recording [SCI-10492] 2024-03-20 12:54:02 +01:00
Martin Artnik 7234bf0886
Merge pull request #7331 from rekonder/aj_SCI_10492 
Fix stock ledger user recording [SCI-10492]
 2024-03-20 12:29:12 +01:00
Andrej 374d4d984e Fix stock ledger user recording [SCI-10492] 2024-03-20 12:27:10 +01:00
Anton 3e929f7ed0 Fix stock modal [SCI-10484] 2024-03-20 11:22:56 +01:00
aignatov-bio 44c8ccb3b0
Fix cards scrolling [SCI-10467] (#7325) 2024-03-20 10:11:00 +01:00
wandji20 cc0d58d76b Css Fix [SCI-10374] 2024-03-19 15:13:17 +01:00
aignatov-bio 19ade498b1
Merge pull request #7322 from wandji20/wb-SCI-10317 
Fix duplicated selected rows [SCI-10317]
 2024-03-19 14:21:09 +01:00
wandji20 743208e070 Fix duplicate selected rows [SCI-10317] 2024-03-19 11:53:29 +01:00
aignatov-bio fa01238dce
Merge pull request #7321 from wandji20/wb-SCI-10367 
Fix issue calculating flyout position [SCI-10367]
 2024-03-19 11:50:25 +01:00
wandji20 4e767155bc Fix issue calculating flyout position [SCI-10367] 2024-03-19 11:26:35 +01:00
ajugo 3df70bdaf3
Merge pull request #7316 from rekonder/aj_SCI_10407 
Add dropdown to access modal for team access [SCI-10407]
 2024-03-19 10:43:39 +01:00
Andrej 3df611483f Add dropdown to access modal for team access [SCI-10407] 2024-03-19 10:25:50 +01:00
ajugo 3fbb21e6d7
Merge pull request #7320 from rekonder/aj_SCI_10450 
Fix loading of projects table navigator [SCI-10450]
 2024-03-19 10:18:22 +01:00
ajugo 333a05bfd1
Merge pull request #7319 from rekonder/aj_SCI_10076 
Fix function call for wrapping tables [SCI-10076][SCI-10463]
 2024-03-19 10:17:52 +01:00
aignatov-bio 7920d7aa8b
Merge pull request #7312 from wandji20/wb-SCI-10441 
Hide last pinned resize cell in tables [SCI-10441]
 2024-03-19 10:15:51 +01:00
dependabot[bot] fd1988d43e
Bump rotp from 6.2.2 to 6.3.0 (#7318) 
Bumps [rotp](https://github.com/mdp/rotp) from 6.2.2 to 6.3.0.
- [Release notes](https://github.com/mdp/rotp/releases)
- [Changelog](https://github.com/mdp/rotp/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mdp/rotp/compare/v6.2.2...v6.3.0)

---
updated-dependencies:
- dependency-name: rotp
  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-03-19 09:45:50 +01:00
Andrej c75dd047bc Fix loading of projects table navigator [SCI-10450] 2024-03-19 09:43:44 +01:00