Commit graph

14862 commits

Author SHA1 Message Date
Ivan Kljun
f16354e498 Add hidden element to support legacy code for MarvinJS at results [SCI-9346] 2023-09-26 10:09:45 +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
4d3c0dd919 Removed delete/edit comment access on archived results [SCI-9289] 2023-09-25 15:33:36 +04: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
wandji
7430f2240d
Add navigation section to item card [SCI-9154] (#6268) 2023-09-25 09:53:12 +02:00
Andrej
65affdf639 Fix css for importing inventory [SCI-9162] 2023-09-25 09:06:13 +02:00
Martin Artnik
3f23d10462
Merge pull request #6281 from G-Chubinidze/gc_SCI_9326
Thumbnail previews on attachments that cannot generate a preview. [SCI-9326]
2023-09-25 09:05:38 +02:00
Andrej
9ca96145d5 Merge branch 'features/october-release' of https://github.com/scinote-eln/scinote-web into aj_SCI_9155_tmp 2023-09-25 08:05:28 +02:00
Andrej
2478918aa6 Fix protocol parser flyout and notifications [SCI-9275] 2023-09-25 07:55:43 +02:00
Giga Chubinidze
5bae359b91 Thumbnail previews on attachments that cannot generate a preview. 2023-09-25 06:30:34 +04:00
Anton
5b434c4e4c Fixes for new flyout [SCI-9343] 2023-09-23 19:15:35 +02:00
wandji
767c98c101
Add barcode and print label to item card [SCI-9156] (#6269)
* Add barcode and print label to item card [SCI-9156]

* Rename wrong label [SCI-9156]
2023-09-22 16:17:42 +02:00
aignatov-bio
da6d294573
Merge pull request #6277 from aignatov-bio/ai-sci-fix-status-color
Fix status color
2023-09-22 14:49:29 +02:00
Anton
6c8447beac Fix status color 2023-09-22 14:46:10 +02:00
Alex Kriuchykhin
50a87b1562
Merge pull request #6235 from wandji20/wb-SCI-8914
Fix issue previweing and realoding assets on hover and after viewmode change [SCI-8914]
2023-09-22 14:14:38 +02:00
Alex Kriuchykhin
c817c269cb
Merge pull request #6270 from lasniscinote/gl_SCI_9153
Refactoring RepositoryItemSidebar and custom columns [SCI-9153]
2023-09-22 14:13:54 +02:00
aignatov-bio
a19a2d16e9
Merge pull request #6272 from aignatov-bio/ai-sci-9340-update-checklists-interactions
Refactor checklist [SCI-9340]
2023-09-22 12:09:41 +02:00
Anton
01e4ab3cd5 Removed variable 2023-09-22 12:07:56 +02:00
aignatov-bio
c6d701e8b2
Merge pull request #6275 from aignatov-bio/ai-sci-css-fixes-results
CSS fixes protocol page
2023-09-22 12:04:41 +02:00
Anton
ad3cd98d6e CSS fixes protocol page 2023-09-22 11:59:39 +02:00
Alex Kriuchykhin
30b848fef3
Merge pull request #6273 from sboursen-scinote/sb_SCI-9147
Improve logic for custom logos on error pages [SCI-9147]
2023-09-22 10:53:44 +02:00
wandji20
3dd7d0fdb3 Fix issue previweing and realoding assets on hover and after viewmode change [SCI-8914] 2023-09-22 09:36:07 +01:00
sboursen-scinote
adc0a460bd Improve logic for custom logos on error pages [SCI-9147]
- Switch to dynamic ERB templates.
- Move text to I18n
2023-09-22 10:26:32 +02:00
Alex Kriuchykhin
912b5862d6
Merge pull request #6271 from okriuchykhin/ok_SCI_7548
Fix missing fonts in PDF reports [SCI-7548]
2023-09-22 10:16:26 +02:00
Oleksii Kriuchykhin
f6dbd45746 Fix missing fonts in PDF reports [SCI-7548] 2023-09-22 10:11:18 +02:00
wandji20
ff463f2db1 Fix issue previewing large image after edit [SCI-8914] 2023-09-22 09:10:56 +01:00
Anton
566705cb67 Small fixes [SCI-9340] 2023-09-22 10:07:29 +02:00
Alex Kriuchykhin
3500b5f08c
Merge pull request #6266 from sboursen-scinote/sb_SCI-9215
Remove the Experiment ID from the three dots menu [SCI-9215]
2023-09-22 10:01:44 +02:00
Anton
77948572f1 Refactor checklist [SCI-9340] 2023-09-22 08:36:37 +02:00
Giga Chubinidze
add1a55e0d Dot divider between steps/results 2023-09-22 05:25:33 +04:00
Gregor Lasnibat
1bf2bc6156 Refactoring RepositoryItemSidebar and custom columns [SCI-9153]
Fixed regular card (without cusotm columns) styles [SCI-9153]

Updated API to return column name, working on subcomponents [SCI-9153]

TooltipPreview on dynamic file component working [SCI-9153]

Finished new item card refactor [SCI-9153]

PR fix 01 [SCI-9153]

PR fixes 02 [SCI-9153]
2023-09-21 20:18:20 +02:00