Commit graph

14528 commits

Author SHA1 Message Date
Alex Kriuchykhin
6ae8b3d45a
Merge pull request #6381 from rekonder/aj_SCI_9475
Fix css for item card [SCI-9475]
2023-10-09 15:42:04 +02:00
Andrej
ab49c52054 Fix css for item card [SCI-9475] 2023-10-09 09:33:38 +02:00
Alex Kriuchykhin
0ebcb58fa6
Merge pull request #6336 from lasniscinote/gl_SCI_9354
Fixed breaking QR code generation [SCI-9354]
2023-10-05 10:12:14 +02:00
Martin Artnik
5b29ccd1f9
Merge pull request #6354 from lasniscinote/gl_SCI_9418
Fixed edit date/datetime columns range option selection [SCI-9418]
2023-10-04 14:16:27 +02:00
Gregor Lasnibat
6dbc3c5aaa Fixed edit date/datetime columns range option selection [SCI-9418]
Fixed edit date/datetime columns range option selection [SCI-9418]
2023-10-04 14:05:51 +02:00
Martin Artnik
3b51055efe
Merge pull request #6348 from lasniscinote/gl_SCI_9393
Fix scroll to start when navigating inventory pages [SCI-9393]
2023-10-04 13:52:48 +02:00
Gregor Lasnibat
edabe117a9 Fix scroll to start when navigating inventory pages [SCI-9393]
PR fix 01 [SCI-9393]
2023-10-04 10:54:03 +02:00
Alex Kriuchykhin
b8708e7961
Merge pull request #6317 from wandji20/wb-SCI-9314
Update formula, ruleJS, and parser vendor files to latest version [SCI-9314]
2023-10-03 16:54:20 +02:00
wandji20
8b589185b5 Add copyright, lisence, and include original modifications [SCI-9314] 2023-10-03 14:57:41 +01:00
Gregor Lasnibat
87714b4dd9 Fixed breaking QR code generation [SCI-9354] 2023-10-03 15:11:40 +02:00
Alex Kriuchykhin
f3f4fc1ad0
Merge pull request #6333 from okriuchykhin/ok_SCI_9368
Use custom sanitizer config for PDF reports generation [SCI-9368]
2023-10-03 13:09:50 +02:00
Alex Kriuchykhin
a000f0e67e
Merge pull request #6303 from wandji20/wb-SCI-9157
Add export button to item card [SCI-9157]
2023-10-03 12:52:03 +02:00
wandji20
285276a59a Rename item card export label [SCI-9157] 2023-10-03 10:54:45 +01:00
wandji20
2372edcf25 Add export button to item card [SCI-9157] 2023-10-03 10:52:57 +01:00
Alex Kriuchykhin
42b145648f
Merge pull request #6276 from wandji20/wb-SCI-9359
Update OVE package and fix bug opening github issue link [SCI-9359]
2023-10-03 10:18:11 +02:00
Oleksii Kriuchykhin
d9404df361 Use custom sanitizer config for PDF reports generation [SCI-9368] 2023-10-03 09:39:47 +02:00
Alex Kriuchykhin
3d653c43ad
Merge pull request #6330 from lasniscinote/gl_SCI_9354
RepositoryItemSidebar css fix [SCI-9354]
2023-10-03 09:27:57 +02:00
wandji20
7b9e4088de Update OVE package and fix bug opening github issue link [SCI-9359] 2023-10-02 23:33:46 +01:00
Gregor Lasnibat
a5ad6d375e Fixed repositoryItemSidebar wrapper covering up content when closed [SCI-9354] 2023-10-02 17:00:47 +02:00
Alex Kriuchykhin
f40e5a3c46
Merge pull request #6294 from lasniscinote/gl_SCI_9354
Item card preload and section title animation[SCI-9354]
2023-10-02 13:51:49 +02:00
wandji20
8684e2d361 Update formula, ruleJS, and parser vendor files to latest version [SCI-9314] 2023-09-29 10:35:21 +01:00
Alex Kriuchykhin
9745ef62dc
Merge pull request #6315 from okriuchykhin/ok_SCI_9369
Reduce allowed data attributes in sanitizer config only to data-mce-token [SCI-9369]
2023-09-29 11:24:25 +02:00
Oleksii Kriuchykhin
2bbb33d225 Reduce allowed data attributes in sanitizer config only to data-mce-token [SCI-9369] 2023-09-29 10:49:53 +02:00
Gregor Lasnibat
f352c7f186 Working on new behaviour for switching between item clicks [SCI-9354]
Working on scrolling and highlighting [SCI-9354]

Item card preload and section title animation [SCI-9354]

Added box-shadow [SCI-9354]

Refactored logic and styles [SCI-9354]

PR fix, added back the missing HighlightComponent [SCI-9354]

PR fixes, refactoring [SCI-9354]

PR fix [SCI-9354]

Fixed scrolling to 'Assigned', highlighting [SCI-9354]

PR fix, modular logic, rename [SCI-9354]
2023-09-28 13:21:20 +02:00
Alex Kriuchykhin
ba5ef94764
Merge pull request #6253 from rekonder/aj_SCI_9155_tmp
Add assigned tasks block to the item card [SCI-9155]
2023-09-27 15:03:20 +02:00
Andrej
5e5010632d Fix naming in assigned my module helper [SCI-9155] 2023-09-27 11:44:08 +02:00
Alex Kriuchykhin
f76cb49cff
Merge pull request #6299 from rekonder/aj_SCI_9362
Escape inventory column names [SCI-9362]
2023-09-27 09:53:57 +02:00
Andrej
701de269f2 Escape inventory column names [SCI-9362] 2023-09-26 14:19:17 +02:00
Oleksii Kriuchykhin
d69b7cc6e8 Merge branch 'develop' into features/october-release 2023-09-26 11:11:30 +02:00
Martin Artnik
a1cbfa9736
Merge pull request #6295 from ivanscinote/SCI-9333-import-dropdown-always-open-on-protocol-templates
Fix dropdown always open on protocol templates [SCI-9333]
2023-09-26 10:06:55 +02:00
Ivan Kljun
0794b4bdc7 Fix dropdown always open on protocol templates [SCI-9333] 2023-09-26 09:11:54 +02:00
Alex Kriuchykhin
2771c04257
Merge pull request #6288 from rekonder/aj_SCI_9367
Fix comment permission check [SCI-9367]
2023-09-25 17:14:29 +02:00
Martin Artnik
80afa31632
Merge pull request #6293 from aignatov-bio/ai-sci-9375-add-selected-state-for-dropdown
Add assets_view_mode for result [SCI-9375]
2023-09-25 16:44:18 +02:00
Anton
254b55772d Add assets_view_mode for result [SCI-9375] 2023-09-25 16:43:14 +02:00
Martin Artnik
fba87cfc40
Merge pull request #6274 from G-Chubinidze/gc_SCI_9341
Dot divider between steps/results [SCI-9341]
2023-09-25 16:28:41 +02:00
Martin Artnik
5c6f97a032
Merge pull request #6292 from aignatov-bio/ai-sci-9375-add-selected-state-for-dropdown
Fix selected state for dropdown [SCI-9385][SCI-9276][SCI-9375][SCI-9379]
2023-09-25 15:06:12 +02:00
Anton
2b9ae65a51 Fix selected state for dropdown [SCI-9385][SCI-9276][SCI-9375][SCI-9379] 2023-09-25 15:04:41 +02:00
Martin Artnik
30561ea5c2
Merge pull request #6291 from aignatov-bio/ai-sci-css-fixes
CSS Fixes
2023-09-25 14:26:42 +02:00
Anton
2b676f249b Css Fixes 2023-09-25 14:15:08 +02:00
Alex Kriuchykhin
1ff89787f0
Merge pull request #6278 from lasniscinote/gl_SCI_9153_v2
Added a missing RepositoryTimeValue component [SCI-9153]
2023-09-25 14:05:17 +02:00
Gregor Lasnibat
4e6646e3f9 Added a missing RepositoryTimeValue component [SCI-9153-v2]
PR fix [SCI-9153-v2]

PR fix 02 [SCI-9153-v2]
2023-09-25 14:02:05 +02:00
Giga Chubinidze
3cee796ac6 added spacings between dots 2023-09-25 14:56:06 +04:00
Andrej
4e6ccce9dd Merge branch 'features/october-release' of https://github.com/scinote-eln/scinote-web into aj_SCI_9155_tmp 2023-09-25 11:49:51 +02:00
Andrej
e0355bd75a Fix generation of labels [SCI-9155] 2023-09-25 11:47:30 +02:00
Andrej
ce1fe53ceb Fix comment permission check [SCI-9367] 2023-09-25 11:14:22 +02:00
wandji
7dac5e63be
Add navigation section to item card [SCI-9154] (#6252) 2023-09-25 10:49:09 +02:00
wandji
5314ef14c7
Revert "Add navigation section to item card [SCI-9154] (#6268)" (#6284)
This reverts commit 7430f2240d.
2023-09-25 10:46:19 +02:00
Martin Artnik
2670b6f74a
Merge pull request #6286 from scinote-eln/features/september-release
Features/september release
2023-09-25 10:38:18 +02:00
Martin Artnik
3a22d7715d Merge branch 'develop' into features/september-release 2023-09-25 10:37:40 +02:00
aignatov-bio
647d94bebc
Merge pull request #6279 from aignatov-bio/ai-sci-9343-improve-flyouts
Fixes for new flyout [SCI-9343]
2023-09-25 10:15:11 +02:00