Commit graph

900 commits

Author SHA1 Message Date
wandji20
d4d2ad55e6 Fix Canvas - Broken new comment badge while adding new comments [SCI-10541] 2024-03-28 12:03:17 +01:00
wandji
32468ca683
Reset cards grid columns on window or navigator resize [SCI-10374] (#7269) 2024-03-14 18:35:22 +01:00
Anton
d72e63a0f2 Merge branch 'develop' into features/inventory-import-improvements 2024-02-26 10:46:49 +01:00
Martin Artnik
35ce14a929 Fix MarvinJS initiaization [SCI-10260] 2024-02-21 13:29:29 +01:00
Martin Artnik
d4f35f51bd Fix loading of MarvinJS object (when MarvinJS is disabled) [SCI-10260] 2024-02-21 10:58:49 +01:00
Martin Artnik
f8aae8aca6 Merge branch 'develop' into features/inventory-import-improvements 2024-02-20 15:18:07 +01:00
Gregor Lasnibat
68e9d3f400
Merge pull request #7058 from lasniscinote/gl_SCI_10076
(fix) TinyMCE issues - Code samples & Wide tables [SCI-10076]
2024-02-20 14:42:28 +01:00
Gregor Lasnibat
7c4e4a8ee7 (fix) TinyMCE issues - Code samples & Wide tables [SCI-10076] 2024-02-20 14:31:37 +01:00
Martin Artnik
c273219a00 Block header links of smart annotation on long loads [SCI-10087] 2024-02-15 14:49:22 +01:00
Martin Artnik
bf6e990435
Merge pull request #7080 from artoscinote/ma_SCI_10087
Show loader when loading smart annotations [SCI-10087]
2024-02-12 15:54:35 +01:00
Martin Artnik
f2d06a9636 Show loader when loading smart annotations [SCI-10087] 2024-02-12 12:58:57 +01:00
Ivan Kljun
aec115f669 Add polling for asset changes for SciNote Edit [SCI-10122] 2024-02-07 11:26:40 +01:00
ajugo
9d48cbbb86
Improve error handling for label printing [SCI-10039] (#6997) 2024-01-31 11:10:11 +01:00
wandji
5bc542e834
Fix displayed comment counter for first comment in protocol steps and results [SCI-9573] (#7013) 2024-01-30 14:35:44 +01:00
Gregor Lasnibat
6d3b604276 (fix) TypeError is logged when you press backspace in an empty keywords input field [SCI-9389] 2024-01-29 15:20:32 +01:00
Anton
bd48ae1d07 Merge branch 'features/asset-sync' of github.com:scinote-eln/scinote-web into features/asset-sync 2024-01-19 11:34:42 +01:00
Anton
9d19fe8382 Merge branch 'develop' into features/asset-sync 2024-01-19 11:33:40 +01:00
Giga Chubinidze
7a803971f9 Red dot is applied on experiment/task page [SCI-9925] 2024-01-17 05:06:32 +04:00
Alex Kriuchykhin
a43eacaa22
Fix inclusion of relationships column in repository exports [SCI-9716] (#6954) 2024-01-16 13:07:11 +01:00
Martin Artnik
ef5f822af2 Merge branch 'develop' into features/asset-sync 2024-01-15 11:57:03 +01:00
Oleksii Kriuchykhin
3b97571777 Merge branch 'features/inventory-items-relationships' into develop 2024-01-10 17:10:20 +01:00
Martin Artnik
7a4d17f63e Merge branch 'develop' into features/asset-sync 2024-01-10 16:31:21 +01:00
Andrej
c73bc0bed1 Fix loading of non-repository tables on item cards changes [SCI-9970] 2024-01-10 09:43:16 +01:00
ajugo
a6c0c7294b
Improve objects loading and permissions checking for repository rows [SCI-9763] (#6875) 2024-01-09 09:37:50 +01:00
ajugo
d02e614245
Fix label printing form inventory item [SCI-9972] (#6906) 2024-01-09 09:33:40 +01:00
wandji
184944dd5f
Improve interface and interaction of relationships column [SCI-9893] (#6851)
* Improve interface and interaction of relationships column [SCI-9893]

* Fix failling specs (use column order than relationships for sorting) [SCI-9893]
2023-12-21 12:32:35 +01:00
Martin Artnik
66feec3074 Merge branch 'develop' into features/asset-sync 2023-12-06 11:23:31 +01:00
Gregor Lasnibat
29e3517f51 Implement a link in the relationships column [SCI-9670] 2023-11-27 16:31:05 +01:00
Oleksii Kriuchykhin
01219f09eb Merge branch 'develop' into features/inventory-items-relationships 2023-11-23 11:08:42 +01:00
Martin Artnik
18b5222227 Merge branch 'features/inventory-item-card-edit' into develop 2023-11-22 15:09:10 +01:00
Martin Artnik
19297c8f69 Fix label printing modal [SCI-9749] 2023-11-21 13:39:21 +01:00
wandji
91f650e227
Reload inventory table after changes to item card [SCI-9617] (#6626)
* Reload inventory table row after changes to item card [SCI-9617]

* Reload full table after updating item card column [SCI-9617]

* Update 2 line if condition formatting style [SCI-9617]
2023-11-20 15:26:01 +01:00
Oleksii Kriuchykhin
cc8b993430 Merge branch 'develop' into features/inventory-item-card-edit 2023-11-16 11:12:50 +01:00
Oleksii Kriuchykhin
e8abbbbcdf Merge branch 'develop' into features/inventory-items-relationships 2023-11-16 11:04:27 +01:00
Oleksii Kriuchykhin
3bc7edc7f7 Merge branch 'develop' into features/inventory-item-card-edit 2023-11-15 10:58:42 +01:00
Martin Artnik
57d5d03718 Merge branch 'develop' into features/asset-sync 2023-11-14 09:41:42 +01:00
Oleksii Kriuchykhin
29f43d42af Merge branch 'features/inventory-item-card-edit' into features/inventory-items-relationships 2023-11-10 09:26:05 +01:00
Oleksii Kriuchykhin
0b72740062 Merge branch 'develop' into features/inventory-items-relationships 2023-11-10 09:19:45 +01:00
Anton
c7cd435e95 Merge branch 'develop' into features/datetime-picker 2023-11-09 11:40:26 +01:00
Martin Artnik
136440f704
Merge pull request #6582 from G-Chubinidze/gc_SCI_9521
Issues with attachment previews [SCI-9521]
2023-11-09 10:48:18 +01:00
Anton
ee857feece Merge branch 'develop' into features/datetime-picker 2023-11-08 14:19:15 +01:00
Martin Artnik
f26950f249 Fix initialization of MarvinJS [SCI-9642] 2023-11-06 14:16:15 +01:00
Anton
d4f555da40 Replace datepicker in filters [SCI-9626] 2023-11-06 10:12:06 +01:00
Giga Chubinidze
d84e6e2e4e Issues with attachment previews [SCI-9521] 2023-11-06 13:06:59 +04:00
ajugo
d82ec3a705
Fix zebra label printing order [SCI-9575] (#6574) 2023-11-03 10:11:19 +01:00
Martin Artnik
16ebf0cbe8
Revert "Revert "Refocus on tinymce editor after marvinjs img update [SCI-9515]"" 2023-11-02 13:18:50 +01:00
Martin Artnik
3a3d62a1be Merge branch 'develop' into features/asset-sync 2023-11-02 11:28:17 +01:00
Anton
70bbc0af47 Add new datetime picker [SCI-9127] 2023-10-30 15:19:39 +01:00
wandji
a16de72611
Mange stock modal improvements [SCI-9591] (#6545)
* Mange stock modlla improvements [SCI-9591]

* Fix manage stock modal close button [SCI-9591]

* Update manage stock url after update stock value [SCI-9591]
2023-10-30 09:47:10 +01:00
Oleksii Kriuchykhin
ee76488f32 Merge branch 'develop' into features/inventory-item-card-edit 2023-10-27 14:25:32 +02:00