178 commits

Author	SHA1	Message	Date
ajugo	566decd9ed	Inventory relationship fixes [SCI-10005] (#6941)	2024-01-15 11:08:08 +01:00
Oleksii Kriuchykhin	95ab33a58b	Merge branch 'develop' into features/inventory-items-relationships	2024-01-05 11:27:32 +01:00
wandji	7b259ab781	Move manage stock modal to application view layout [SCI-9835] (#6831)	2023-12-18 11:49:54 +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	2b51a4f4bd	Vue3 migration mfixes [SCI-9733][SCI-9735][SCI-9736][SCI-9738]	2023-11-20 11:41:30 +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	e8abbbbcdf	Merge branch 'develop' into features/inventory-items-relationships	2023-11-16 11:04:27 +01:00
Oleksii Kriuchykhin	0b72740062	Merge branch 'develop' into features/inventory-items-relationships	2023-11-10 09:19:45 +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	a6b22b958c	Fix datetime picker css	2023-11-07 16:10:17 +01:00
Anton	70bbc0af47	Add new datetime picker [SCI-9127]	2023-10-30 15:19:39 +01:00
sboursen-scinote	b93baeb730	Replace Scinote Icons [SCI-9557]	2023-10-28 12:51:11 +02:00
Anton	226d189789	Add new datetime pciker [SCI-9127]	2023-10-26 15:01:26 +02:00
Martin Artnik	d74cd77e41	Merge pull request #6516 from scinote-eln/develop ... Merge develop	2023-10-23 11:14:50 +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	9c302f186b	Merge branch 'features/navigator-resize' into SCI-9318-making-navigator-resizable	2023-10-13 10:33:37 +02:00
Ivan Kljun	d34d424b0f	Make navigator resizable [SCI-9318]	2023-10-12 14:45:51 +02:00
Andrej	79118effa7	Merge branch 'develop' into features/october-release	2023-10-10 11:09:04 +02:00
wandji20	dd34e72fb9	Add helper method to show grey layout background [SCI-9406]	2023-10-03 12:48:31 +01:00
Gregor Lasnibat	80de7483eb	Prepare a modal displaying relationships for a specific item [SCI-9357]	2023-10-03 09:33:39 +02:00
Andrej	835cfb5e07	Refactor export stock consumption modal [SCI-9386]	2023-10-03 09:27:10 +02:00
Oleksii Kriuchykhin	d69b7cc6e8	Merge branch 'develop' into features/october-release	2023-09-26 11:11:30 +02:00
Anton	40144ea33f	Update protocol template screen [SCI-9319]	2023-09-21 10:37:58 +02:00
Oleksii Kriuchykhin	3b170a0c0d	Connect backend to the new item card [SCI-9313]	2023-09-18 16:42:01 +02:00
Oleksii Kriuchykhin	36f4e22fa3	Merge branch 'develop' into features/october-release	2023-09-15 14:08:45 +02:00
wandji20	0b0eddd62b	Add default columns to inventory item card [SCI-9151]	2023-09-15 11:39:42 +01:00
Anton	af0fbfeec0	Merge branch 'develop' into features/september-release	2023-09-14 13:45:40 +02:00
Gregor Lasnibat	6709d5ee73	Finished v.01 of inventory item card (RepositoryItemSidebar) [SCI-9091]	2023-09-13 08:34:07 +02:00
Martin Artnik	3724a4a067	Merge branch 'develop' into features/september-release	2023-09-01 10:30:48 +02:00
Andrej	29cddf5ef7	Merge branch 'develop' into features/ove-integration	2023-08-22 11:00:34 +02:00
Anton	0161277380	Fix bootstrap in report [SCI-9085]	2023-08-21 15:26:58 +02:00
Anton	2d64d2fcbf	Merge branch 'develop' into features/september-release	2023-08-21 11:25:27 +02:00
artoscinote	20c20012b2	Merge pull request #5863 from ivanscinote/SCI-8807-notifications ... Remove system notifications [SCI-8807]	2023-08-18 10:28:05 +02:00
Alex Kriuchykhin	145b834e8a	Merge pull request #5935 from ivanscinote/SCI-8800-projects-table-double-load ... Add turbolinks-cache-control to no-preview [SCI-8800]	2023-08-16 11:06:16 +02:00
Martin Artnik	8d31c5eb3b	Merge branch 'develop' into features/ove-integration	2023-08-16 10:41:26 +02:00
Alex Kriuchykhin	a4ea995027	Revert to using intermediate jquery_bundle file [SCI-9031] (#5962)	2023-08-10 17:19:28 +02:00
Alex Kriuchykhin	c6a545d8b3	Fix Turbolinks redirects with ajax requests, add JQuery migration library [SCI-9031] (#5961)	2023-08-10 16:25:04 +02:00
Anton	ac37885885	Merge branch 'develop' into features/september-release	2023-08-10 15:01:58 +02:00
aignatov-bio	acab34679d	Merge pull request #5960 from aignatov-bio/ai-test-jquery-pr ... Restore bootstrap overrides	2023-08-10 14:43:12 +02:00
Anton	3c0ccc730f	Restore bootstrap overrides	2023-08-10 14:36:06 +02:00
Martin Artnik	16dbd48ad3	Merge branch 'develop' into features/september-release	2023-08-10 13:21:27 +02:00
ajugo	2ddb43c2ea	Merge pull request #5850 from sboursen-scinote/sb_SCI-8842 ... Update illustrations [SCI-8842]	2023-08-10 10:53:41 +02:00
sboursen-scinote	d97035988a	Move images to public folder [SCI-8842]	2023-08-10 10:33:35 +02:00
Martin Artnik	a952319afd	Merge branch 'develop' into features/september-release	2023-08-09 16:43:15 +02:00
Anton	2da83f460f	Test moving jquery	2023-08-09 14:43:17 +02:00
Anton	f688995635	Refactor task page UX [SCI-8951]	2023-08-09 11:03:30 +02:00