Commit graph

3544 commits

Author SHA1 Message Date
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
aignatov-bio
2f2fbc926e
Merge pull request #6899 from ivanscinote/SCI-9951-ik
Remove blur event listener from legacy inline edit [SCI-9951]
2024-01-09 15:18:21 +01:00
Gregor Lasnibat
5d4234a376 (fix) Wide code sample on a shared task [SCI-9942] 2024-01-09 12:56:30 +01:00
Anton
3346c55941 Merge branch 'develop' into features/new-datatable 2024-01-09 10:36:21 +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
Ivan Kljun
370b3a03ed Remove blur event listener from legacy inline edit [SCI-9951] 2024-01-08 12:00:26 +01:00
wandji
16bf3217e4
Fix issue opening item card [SCI-9961] (#6898)
* Fix issue opening item card [SCI-9961]

* Fix failing tests [SCI-9961]
2024-01-08 11:30:04 +01:00
ajugo
2020a8ce17
Merge pull request #6886 from sboursen-scinote/sb_SCI-9948
Fix issues with relationships columns in inventory table [SCI-9948]
2024-01-05 16:41:12 +01:00
Oleksii Kriuchykhin
95ab33a58b Merge branch 'develop' into features/inventory-items-relationships 2024-01-05 11:27:32 +01:00
sboursen-scinote
e62a4a60ad Fix issues with relationships columns in inventory table [SCI-9948] 2024-01-05 10:40:12 +01:00
Martin Artnik
0a5432f5bc
Merge pull request #6872 from artoscinote/ma_SCI_9737
Fix report table action buttons initialization [SCI-9737]
2024-01-04 11:00:39 +01:00
Martin Artnik
e360113838 Merge branch 'develop' into features/asset-sync 2024-01-04 10:07:11 +01:00
wandji
9ade9e890f
Render webhooks form url errors using data-error-text attribute [SCI-9743] (#6869) 2024-01-03 19:08:33 +01:00
Martin Artnik
24309a4e03 Fix report table action buttons initialization [SCI-9737] 2024-01-03 16:31:31 +01:00
Anton
4671754d52 Migrate protocols table [SCI-9802] 2024-01-03 14:57:32 +01:00
Soufiane
395a214175
Prevent emitting multiple requests when opening the manage columns modal [SCI-9696] (#6867) 2024-01-03 11:50:16 +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
Soufiane
6d65315741
Fix wide table scroll bar issues on shared tasks [SCI-9762] (#6767) 2023-12-20 10:11:15 +01:00
wandji
007567b4cc
Add flash error message for inventory items import [SCI-9739] (#6829) 2023-12-18 11:27:08 +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
Oleksii Kriuchykhin
372ef32f03 Merge branch 'develop' into features/inventory-items-relationships 2023-12-14 11:28:04 +01:00
Martin Artnik
9b97e397ed Merge branch 'develop' into features/asset-sync 2023-12-13 16:05:18 +01:00
Oleksii Kriuchykhin
970dc7185b Merge branch 'develop' into features/bugfixes-and-improvements 2023-12-13 16:01:09 +01:00
Alex Kriuchykhin
741e053ef4
Add checking for ability to share a repository with allowed write [SCI-9853] (#6807) 2023-12-13 15:31:21 +01:00
Soufiane
456bd0922f
Make item relationship togglable [SCI-9669] (#6648)
* Make item relationship togglable [SCI-9669]

* Fix broken tests [SCI-9669]
2023-12-12 12:54:15 +01:00
Martin Artnik
c7c72983ca
Merge pull request #6793 from G-Chubinidze/gc_SCI_9811
[CAPA] Unable to view assigned persons within a task [SCI-9811]
2023-12-11 13:35:07 +01:00
Martin Artnik
66feec3074 Merge branch 'develop' into features/asset-sync 2023-12-06 11:23:31 +01:00
Oleksii Kriuchykhin
d1e7ab5efb Merge branch 'develop' into features/inventory-items-relationships 2023-12-06 11:11:30 +01:00
Oleksii Kriuchykhin
bd89a0c9bf Merge branch 'develop' into features/bugfixes-and-improvements 2023-12-06 11:09:34 +01:00
wandji
4df097b251
Init provisioning polling after successful cloning tasks [SCI-9796] (#6758) 2023-12-05 10:15:11 +01:00
Giga Chubinidze
33527d14c8 [CAPA] Unable to view assigned persons within a task [SCI-9811] 2023-12-05 12:05:35 +04:00
Gregor Lasnibat
29e3517f51 Implement a link in the relationships column [SCI-9670] 2023-11-27 16:31:05 +01:00
Oleksii Kriuchykhin
9983d70eec Merge branch 'develop' into features/bugfixes-and-improvements 2023-11-23 11:11:46 +01:00
Oleksii Kriuchykhin
01219f09eb Merge branch 'develop' into features/inventory-items-relationships 2023-11-23 11:08:42 +01:00
Martin Artnik
8e080d5314 Actually add proper e2e ids to inventories and inventory items [SCI-9624] 2023-11-22 15:51:31 +01:00
Martin Artnik
e13314349c Merge branch 'release/1.28.0' into develop 2023-11-22 15:13:57 +01:00
Martin Artnik
18b5222227 Merge branch 'features/inventory-item-card-edit' into develop 2023-11-22 15:09:10 +01:00
Soufiane
bc2904823d
Add link to assigned item to task for snapshots version [SCI-9689] (#6656) 2023-11-22 14:53:08 +01:00
Martin Artnik
0b2c8546c0 Add proper e2e ids to inventories and inventory items [SCI-9624] 2023-11-22 13:49:29 +01:00
aignatov-bio
4d3c9381b0
Merge pull request #6679 from aignatov-bio/ai-sci-9748-fix-repository-search
Fix filters and missing barcode icon [SCI-9748]
2023-11-21 14:05:25 +01:00
Anton
25048ddd4e Fix filters and missing barcode icon [SCI-9748] 2023-11-21 13:51:16 +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
ajugo
8853f54ad3
Fix rendering template for additional data for reports [SCI-9717] (#6660) 2023-11-17 11:11:07 +01:00
Oleksii Kriuchykhin
f7d8fc96ac Merge branch 'develop' into features/bugfixes-and-improvements 2023-11-17 10:44:32 +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
Anton
13eca7e035 Fix time format and picker position [SCI-9706] 2023-11-15 16:18:00 +01:00
Oleksii Kriuchykhin
3bc7edc7f7 Merge branch 'develop' into features/inventory-item-card-edit 2023-11-15 10:58:42 +01:00
Anton
7fe2922f2d Merge branch 'features/datetime-picker' of github.com:scinote-eln/scinote-web into features/datetime-picker 2023-11-14 18:08:48 +01:00
Anton
6abc643aec Merge branch 'develop' into features/datetime-picker 2023-11-14 18:08:03 +01:00
Anton
b162e1b04f Fix repository range validation [SCI-9691] 2023-11-14 15:21:42 +01:00
Martin Artnik
83eb4eeb16 Make task description TinyMCE init in line with the vue one [SCI-9682] 2023-11-14 11:54:50 +01:00
Anton
b7f876aa37 Date time picker improvments [SCI-9678][SCI-9688] 2023-11-14 11:26:27 +01:00
Martin Artnik
57d5d03718 Merge branch 'develop' into features/asset-sync 2023-11-14 09:41:42 +01:00
wandji
64669dee4d
Increase dataTables_scrollbody width when it has y-overflow [SCI-8610] (#6598) 2023-11-10 14:58:15 +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
923df0ddfb
Merge pull request #6610 from lasniscinote/gl_SCI_9311
Fixed [CAPA] - Tasks do not show up in Table View [SCI-9311]
2023-11-09 10:48:59 +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
Gregor Lasnibat
0109c8f288 Fixed [CAPA] - Tasks do not show up in Table View [SCI-9311] 2023-11-09 08:36:30 +01:00
Anton
f92f0790ed Fix resizeable navigator 2023-11-08 19:32:43 +01:00
Anton
dcf206368e Merge branch 'features/datetime-picker' of github.com:scinote-eln/scinote-web into features/datetime-picker 2023-11-08 14:57:29 +01:00
Anton
ee857feece Merge branch 'develop' into features/datetime-picker 2023-11-08 14:19:15 +01:00
Anton
b09bd8a3c5 Add style styling to datetime pixker [SCI-9627] 2023-11-08 13:55:08 +01:00
Anton
2ab479950a Replace datetime picker in activties and create task 2023-11-07 15:15:37 +01:00
Anton
688538aa39 Replace datetime pickers in repositories [SCI-9629] 2023-11-07 11:46:25 +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
Anton
9cb9680c55 Replace datetime picker in canvas [SCI-9630] 2023-11-02 13:36:47 +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
Anton
04fc356175 Replace datepicker in task table [SCI-9631] 2023-11-02 13:11:06 +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
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
mvrazic
e4f49a86ab
e2e - modified tags where names were used [SCI-9620] (#6538) 2023-10-26 16:03:58 +02:00
Oleksii Kriuchykhin
6235a03595 Merge branch 'develop' into e2e 2023-10-26 15:36:36 +02:00
Anton
7515c979dd Fix dropdown click aways [SCI-9599] 2023-10-25 14:29:08 +02:00
Anton
da3c54b7f0 Merge branch 'develop' into features/bugfixes-and-css 2023-10-25 13:26:06 +02:00
Ivan Kljun
2031286261 Implement file-checkout localhost call [SCI-9466] 2023-10-25 09:30:42 +02:00
Alex Kriuchykhin
1eece29f84
Fix error at filtering by date on project page [SCI-9590] (#6523) 2023-10-24 16:00:41 +02:00
Martin Artnik
4f014394e2 Fix members filter [SCI-9585] 2023-10-23 13:31:27 +02:00
Martin Artnik
d74cd77e41
Merge pull request #6516 from scinote-eln/develop
Merge develop
2023-10-23 11:14:50 +02:00
ajugo
849743a410
Fix repository reload on cancel button click on import modal [SCI-9316] (#6511) 2023-10-20 12:53:34 +02:00
Martin Vražič
c392b5114f Modified and added new tags mostly for inventories section. 2023-10-20 11:23:51 +02:00
Martin Artnik
040379039f
Merge pull request #6510 from G-Chubinidze/gc_SCI_9552
Report - Well plates columns fix [SCI-9552]
2023-10-20 10:16:11 +02:00
Gregor Lasnibat
6812bd135b
Fixed double PATCH request sent [SCI-9568] (#6512) 2023-10-20 09:37:09 +02:00
Giga Chubinidze
186eb1cc7e Report - Well plates columns fix [SCI-9552] 2023-10-20 02:27:06 +04:00
Alex Kriuchykhin
8a18bc6ad3
Fix item card on results page, fix smart annotation links in RTE fields [SCI-9572] (#6506) 2023-10-19 16:35:23 +02:00
Alex Kriuchykhin
18c03eb836
Fix smart annotation links on the item card [SCI-9571] (#6501) 2023-10-19 16:35:15 +02:00
sboursen-scinote
e0d1841b7b Fix blurring of stacked modals [SCI-9549] 2023-10-18 17:15:17 +02:00