Commit graph

14488 commits

Author SHA1 Message Date
Martin Artnik
923006dc38
Merge pull request #6300 from aignatov-bio/ai-sci-9382-results-bug-fixes
Bug fixes [SCI-9382][SCI-9392][SCI-9395][SCI-9396]
2023-09-27 12:41:34 +02:00
Martin Artnik
9b2e5b6455
Merge pull request #6289 from G-Chubinidze/gc_SCI_9289
Removed delete/edit comment access on archived results [SCI-9289]
2023-09-27 12:41:03 +02:00
Martin Artnik
187c8b12f9
Merge pull request #6296 from ivanscinote/SCI-9346-cannot-insert-a-chemical-drawing-into-results
Add hidden element to support legacy code for MarvinJS at results [SCI-9346]
2023-09-27 10:43:25 +02:00
Alex Kriuchykhin
9f03d88f12
Merge pull request #6201 from wandji20/wb-SCI-9225
Improve UI for stock consumption export [SCI-9225]
2023-09-27 09:21:22 +02:00
Alex Kriuchykhin
dc40b4354d
Merge pull request #6298 from okriuchykhin/ok_SCI_9282
Fix column placement in stock consumption export, add missing localization [SCI-9282]
2023-09-27 09:20:00 +02:00
Anton
f630b8860b Bug fixes [SCI-9382][SCI-9392][SCI-9395][SCI-9396] 2023-09-26 16:23:16 +02:00
wandji20
213c752941 Improve UI for for exports in inventory with stock enabled [SCI-9225] 2023-09-26 15:20:18 +01:00
Alex Kriuchykhin
8cf26d7a90
Merge pull request #6283 from rekonder/aj_SCI_9162
Fix css for importing inventory [SCI-9162]
2023-09-26 15:07:15 +02:00
Alex Kriuchykhin
15c10f3613
Merge pull request #6282 from rekonder/aj_SCI_9275
Fix protocol parser flyout and notifications [SCI-9275]
2023-09-26 13:42:09 +02:00
Oleksii Kriuchykhin
efae35816f Fix column placement in stock consumption export, add missing localization [SCI-9282] 2023-09-26 13:35:02 +02:00
Andrej
9641c75a4a Merge branch 'develop' of https://github.com/scinote-eln/scinote-web into aj_SCI_9275 2023-09-26 11:23:25 +02:00
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
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
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
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
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
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
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
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
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
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
Alex Kriuchykhin
5cc41451cd
Merge pull request #6254 from sboursen-scinote/sb_SCI-9133
Fix missing icon files in exported projects [SCI-9133]
2023-09-21 17:12:08 +02:00
sboursen-scinote
aa769f92f7 Fix missing icon files in exported projects [SCI-9133] 2023-09-21 15:11:02 +02:00
aignatov-bio
af7bc2f11b
Merge pull request #6265 from aignatov-bio/ai-add-addons-to-tailwind
Add addons to tailwind and label fixes
2023-09-21 13:30:37 +02:00
aignatov-bio
60b477b7cc
Merge pull request #6267 from aignatov-bio/ai-sci-9330-fix-modals-after-revamp
Fix modals after revamp [SCI-9330]
2023-09-21 13:30:07 +02:00
Anton
97999028ef Fix modals after revamp [SCI-9330] 2023-09-21 12:52:55 +02:00