Commit graph

1891 commits

Author SHA1 Message Date
Anton
da3c54b7f0 Merge branch 'develop' into features/bugfixes-and-css 2023-10-25 13:26:06 +02:00
Anton
3dd36e1dda Add drag n drop to results [SCI-9576] 2023-10-19 15:58:20 +02:00
sboursen-scinote
885b66504b FIX no custom columns placeholder [SCI-9529] 2023-10-19 10:53:18 +02:00
Martin Artnik
fb9204df64 Merge branch 'develop' into features/bugfixes-and-css 2023-10-18 14:51:35 +02:00
Giga Chubinidze
f268a0cab0 Attachments renamed to Files [SCI-9505] 2023-10-17 11:33:29 +04:00
Gregor Lasnibat
3b4fbc944f Added archived columns [SCI-9469] 2023-10-16 13:02:28 +02:00
Gregor Lasnibat
57bfe0036b
Fix Rename the buttons Show/Hide in multiline text fields [SCI-9439] (#6444) 2023-10-16 10:12:21 +02:00
Gregor Lasnibat
b5ece3429f
Fixed missing inventory columns on item card [SCI-9469] (#6416) 2023-10-13 09:51:50 +02:00
ajugo
04a898760a
Add assign button to item cards [SCI-9158] (#6326) 2023-10-12 15:46:13 +02:00
wandji
45cfe77ef7
Add qr code and print label to item card [SCI-9471 (#6364)
* Add qr acode and print label to item card [SCI-9471

* Remove jQuery handler for setting barcode image src [SCI-9471]
2023-10-12 15:10:54 +02:00
wandji
d236ba0a5b
Add reminders to item card [SCI-9154] (#6285)
* Add reminders to item card [SCI-9154]

* Refactor item card reminder component [SCI-9154]
2023-10-11 09:35:10 +02:00
Andrej
79118effa7 Merge branch 'develop' into features/october-release 2023-10-10 11:09:04 +02:00
Martin Artnik
a9b629bdf7 Copy fixes [SCI-9440] 2023-10-09 11:40:12 +02:00
Martin Artnik
9bf5903c54
Merge pull request #6384 from aignatov-bio/ai-sci-9491-fix-acitvity-type-selector
Fix activity type selector [SCI-9491]
2023-10-09 09:42:50 +02:00
Martin Artnik
1df8ad6f87
Merge pull request #6383 from G-Chubinidze/gc_SCI_9424
CSS:  Various issues [SCI-9424]
2023-10-09 09:41:48 +02:00
Anton
6b6ecf1b43 Fix activity type selector [SCI-9491] 2023-10-09 09:40:42 +02:00
Giga Chubinidze
9b9b486324 CSS: Various issues [SCI-9424] 2023-10-09 11:35:52 +04:00
wandji20
d3c2a7e0ad Fix issue with timestamps for reports [SCI-9420] 2023-10-05 12:25:08 +01:00
Alex Kriuchykhin
4888ebc3eb
Merge pull request #6346 from rekonder/aj_SCI_9442
Add missing wording for failed export email/notifications [SCI-9442]
2023-10-04 15:46:22 +02:00
Andrej
9b1d9823c1 Add missing wording for failed export email/notifications [SCI-9442] 2023-10-04 09:02:35 +02:00
Martin Artnik
64449af994
Merge pull request #6341 from artoscinote/ma_SCI_9441
Fix error translations [SCI-9441]
2023-10-03 15:32:00 +02:00
Martin Artnik
2b76fe6b5b Fix error translations [SCI-9441] 2023-10-03 15:23:49 +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
Martin Artnik
295de7b0bc Implement default name for results [SCI-9425] 2023-09-29 13:01:41 +02:00
Martin Artnik
a1df2b7b52
Merge pull request #6314 from G-Chubinidze/gc_SCI_9245_V2
DOCX not working if result name empty. [SCI-9245]
2023-09-29 12:24:18 +02:00
Giga Chubinidze
0be8ab5839 used i18n 2023-09-29 14:18:45 +04: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
Martin Artnik
d44d29a0fd
Merge pull request #6301 from G-Chubinidze/gc_SCI_9299
OVE - Activities related to Task result [SCI-9299]
2023-09-27 12:49:58 +02:00
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
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
Giga Chubinidze
da70fed43a OVE - Activities related to Task result [SCI-9299] 2023-09-27 03:45:29 +04: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
Oleksii Kriuchykhin
efae35816f Fix column placement in stock consumption export, add missing localization [SCI-9282] 2023-09-26 13:35:02 +02:00
Oleksii Kriuchykhin
d69b7cc6e8 Merge branch 'develop' into features/october-release 2023-09-26 11:11:30 +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
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
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
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
3a22d7715d Merge branch 'develop' into features/september-release 2023-09-25 10:37:40 +02:00
wandji
7430f2240d
Add navigation section to item card [SCI-9154] (#6268) 2023-09-25 09:53:12 +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
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
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
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