Oleksii Kriuchykhin
|
d004b1e7a0
|
Merge branch 'features/bugfixes' into develop
|
2024-03-08 11:21:26 +01:00 |
|
wandji20
|
312fb80d44
|
Add option to reload navigator and all expanded children [SCI-10345]
|
2024-03-04 16:04:11 +01:00 |
|
Anton
|
d72e63a0f2
|
Merge branch 'develop' into features/inventory-import-improvements
|
2024-02-26 10:46:49 +01:00 |
|
Anton
|
ed0db94089
|
Merge branch 'develop' into features/new-datatable
|
2024-02-21 12:51:17 +01:00 |
|
Martin Artnik
|
f8aae8aca6
|
Merge branch 'develop' into features/inventory-import-improvements
|
2024-02-20 15:18:07 +01:00 |
|
wandji
|
49f8274e98
|
Set default image preview opacity to 1 [SCI-10058] (#7022)
|
2024-02-12 10:12:31 +01:00 |
|
Martin Artnik
|
b5b29f66fc
|
Open locally button fixes on preview [SCI-9757]
|
2024-02-05 12:45:15 +01:00 |
|
Ivan Kljun
|
cc4fa19bc1
|
Merge remote-tracking branch 'upstream/develop' into SCI-10010-ik
|
2024-02-01 10:15:58 +01:00 |
|
Martin Artnik
|
4739da3ed1
|
Preview Open locally menu fixes [SCI-9795]
|
2024-01-31 15:15:24 +01:00 |
|
Anton
|
72b40a63a0
|
Merge branch 'develop' into features/new-datatable
|
2024-01-30 12:02:04 +01:00 |
|
Ivan Kljun
|
c2fa110fb2
|
Merge remote-tracking branch 'upstream/features/asset-sync' into SCI-10010-ik
|
2024-01-23 15:32:27 +01:00 |
|
Ivan Kljun
|
0eb323b2f1
|
Add wrong-version modal for SciNote Edit [SCI-10010]
|
2024-01-23 11:54:42 +01:00 |
|
Martin Artnik
|
81a4924d6b
|
Fix Open menu in attachment preview screen [SCI-9757]
|
2024-01-22 16:41:10 +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
|
4b3666b4f8
|
Merge branch 'develop' into features/new-datatable
|
2024-01-19 11:10:32 +01:00 |
|
G-Chubinidze
|
51bcc96251
|
Merge branch 'features/asset-sync' into gc_SCI_9757
|
2024-01-16 17:02:46 +04:00 |
|
mvrazic
|
f57a2d550a
|
e2e - added new tags at inventories section [SCI-9919] (#6858)
|
2024-01-15 16:59:05 +01:00 |
|
Martin Artnik
|
bd1e2696c1
|
Merge pull request #6938 from lasniscinote/gl_SCI_10008
(fix) Modal opened behind the item card [SCI-10008]
|
2024-01-15 12:52:00 +01:00 |
|
Gregor Lasnibat
|
7b1a31eaf3
|
(fix) Modal opened behind the item card [SCI-10008]
|
2024-01-15 12:09:47 +01:00 |
|
ajugo
|
566decd9ed
|
Inventory relationship fixes [SCI-10005] (#6941)
|
2024-01-15 11:08:08 +01:00 |
|
Anton
|
de72f60cc1
|
Merge branch 'develop' into features/new-datatable
|
2024-01-11 15:14:36 +01:00 |
|
Gregor Lasnibat
|
7a3c6084b1
|
(fix) Item card minor issue [SCI-9814_v2] (#6920)
|
2024-01-10 15:32:31 +01:00 |
|
Anton
|
3346c55941
|
Merge branch 'develop' into features/new-datatable
|
2024-01-09 10:36:21 +01:00 |
|
Gregor Lasnibat
|
ac8f5d8198
|
(fix) Background of opened modal from item card is not disabled [SCI-9931] (#6891)
|
2024-01-08 15:09:46 +01:00 |
|
Soufiane
|
c3f8e873e9
|
Fix 500 error when adding stock to item [SCI-9498] (#6883)
|
2024-01-05 13:10:45 +01:00 |
|
Oleksii Kriuchykhin
|
95ab33a58b
|
Merge branch 'develop' into features/inventory-items-relationships
|
2024-01-05 11:27:32 +01:00 |
|
Gregor Lasnibat
|
3e4ccbcc75
|
(fix) Item card minor issue [SCI-9814_v2] (#6846)
|
2023-12-21 11:55:12 +01:00 |
|
Alex Kriuchykhin
|
528d411910
|
e2e - modified and added new tags at inventories section [SCI-9813] (#6741) (#6832)
Co-authored-by: Martin Artnik <martin@scinote.net>
Co-authored-by: mvrazic <144342580+mvrazic@users.noreply.github.com>
|
2023-12-15 16:33:13 +01:00 |
|
Giga Chubinidze
|
7de19c31ec
|
Implement the Open Locally button on file previews [SCI-9757]
|
2023-12-13 23:54:41 +04:00 |
|
Anton
|
9971de5c4c
|
Finalize projects table
|
2023-12-01 09:56:14 +01:00 |
|
Gregor Lasnibat
|
3dd15ed1a5
|
Implement the 'Add relationship' modal, only front end [SCI-9671]
|
2023-11-28 12:44:57 +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 |
|
Anton
|
25048ddd4e
|
Fix filters and missing barcode icon [SCI-9748]
|
2023-11-21 13:51:16 +01:00 |
|
Anton
|
d68367eb37
|
Fix filters layout [SCI-9697]
|
2023-11-20 16:38:45 +01:00 |
|
Martin Artnik
|
3547b7c2d1
|
Merge pull request #6655 from scinote-eln/e2e
Merge e2e
|
2023-11-16 13:23:13 +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
|
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
|
ee857feece
|
Merge branch 'develop' into features/datetime-picker
|
2023-11-08 14:19:15 +01:00 |
|
Anton
|
d4f555da40
|
Replace datepicker in filters [SCI-9626]
|
2023-11-06 10:12:06 +01:00 |
|
Oleksii Kriuchykhin
|
ee76488f32
|
Merge branch 'develop' into features/inventory-item-card-edit
|
2023-10-27 14:25:32 +02:00 |
|
wandji
|
c22d1e226b
|
Add new stock management modal and edit itemm card stock fields [SCI-9415] (#6474)
* Add edit fetaure to item card stock field [SCI-9415]
* Replace manage stock modal [SCI-9415]
* Fix issue displaying item card [SCI-9415]
* Minor improvements [SCI-9415]
* Enable stock modal in assigned inventories [SCI-9415]
* Use toggleable reminder value [SCI-9415]
|
2023-10-27 10:31:38 +02:00 |
|
Oleksii Kriuchykhin
|
6235a03595
|
Merge branch 'develop' into e2e
|
2023-10-26 15:36:36 +02:00 |
|
Anton
|
da3c54b7f0
|
Merge branch 'develop' into features/bugfixes-and-css
|
2023-10-25 13:26:06 +02:00 |
|
Martin Artnik
|
2850135e96
|
Revert "Fixed Item card smart annotation link [SCI-9583]"
This reverts commit 0a3ba6a366.
|
2023-10-24 13:14:23 +02:00 |
|
Martin Artnik
|
1d3c17206c
|
Merge pull request #6514 from lasniscinote/gl_SCI_9583
Fixed Item card smart annotation link [SCI-9583]
|
2023-10-23 13:59:37 +02:00 |
|
Martin Artnik
|
ee076c7f3b
|
Fix user smart annotations [SCI-9574]
|
2023-10-23 11:50:24 +02:00 |
|
Martin Artnik
|
d74cd77e41
|
Merge pull request #6516 from scinote-eln/develop
Merge develop
|
2023-10-23 11:14:50 +02:00 |
|