626 commits

Author	SHA1	Message	Date
aignatov-bio	4a3520883b	Merge pull request #5416 from G-Chubinidze/gc_SCI_8299 ... Implement the bottom action toolbar - inventories [SCI-8299]	2023-05-24 12:06:47 +02:00
Giga Chubinidze	5cd32d5cfa	hound fix	2023-05-24 13:48:32 +04:00
Giga Chubinidze	379ef7a9cc	moved to develop, fixed pagination style	2023-05-24 11:57:06 +04:00
Anton	ecbd900362	Fix inventory page layout [SCI-8515]	2023-05-22 15:47:59 +02:00
Anton	7c9142de5e	Fix action toolbar init [SCI-8413]	2023-05-22 11:31:46 +02:00
sboursen-scinote	16ccd9703f	Implement the assign to task button [SCI-8252]	2023-05-17 16:18:11 +02:00
Alex Kriuchykhin	5a06f649d6	Merge pull request #5417 from scinote-eln/features/sa-item-assigning ... Features/sa item assigning	2023-05-17 11:45:13 +02:00
artoscinote	aeb84e18d0	Implement bottom action toolbar for repository items [SCI-8300] ... Implement bottom action toolbar for repository items [SCI-8300]	2023-05-17 11:27:55 +02:00
Andrej	32d8fc3e0c	Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/sa-item-assigning	2023-05-16 14:26:12 +02:00
Anton	9b2ae96a43	Merge branch 'develop' into features/navigation-refactor-v2	2023-05-16 10:22:11 +02:00
Soufiane	c28f86d46d	Refactor inline events [SCI-8434] (#5403) ... Refactor inline events in task results [SCI-8434]	2023-05-16 09:34:36 +02:00
Anton	8f5560b016	Add barcode search field [SCI-8283]	2023-05-11 11:21:50 +02:00
Anton	5ec202e2c4	Update protocol top toolbar [SCI-8386]	2023-05-09 14:59:43 +02:00
sboursen-scinote	5f8eafedf9	Create a modal for item assignment from inventory page [SCI-8250] ... - Fix the behavior of the search_select. - Fix select options positioning. - Get the items to assign from selected rows. - Style the modal. Style the modal [SCI-8250] Fix select options positioning [SCI-8250]	2023-05-08 09:43:18 +02:00
Andrej	29a9c3781e	Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/sa-item-assigning	2023-05-04 13:34:45 +02:00
Giga Chubinidze	efa0ae9534	Revamp of (top) toolbar - items [SCI-8307]	2023-05-03 23:25:13 +04:00
Giga Chubinidze	a83625fbef	Revamp of (top) toolbar + search field - inventories [SCI-8306]	2023-05-03 00:58:11 +04:00
ajugo	d4abcb4980	Implement assigning items to task when adding a smart annotation [SCI-8208] (#5295)	2023-04-25 15:12:19 +02:00
Soufiane	ea94cf4581	Bulk editing will display inaccurate changes after saving [SCI-8219] (#5267) ... Fix race condition when submitting all forms [SCI-8219]	2023-04-25 14:35:45 +02:00
ajugo	0c24360a81	Fix error message for protocol notes and repository item name [SCI-7185] (#5258)	2023-04-25 14:34:14 +02:00
G-Chubinidze	c6ab7176b8	Merge pull request #5329 from G-Chubinidze/gc_SCI_8293 ... Implement active/archive and view dropdowns (toolbar) [SCI-8293]	2023-04-20 15:41:45 +04:00
Giga Chubinidze	a25e361e4f	Implement active/archive and view dropdowns (toolbar) [SCI-8293]	2023-04-20 15:40:38 +04:00
sboursen-scinote	dcd6f6267d	Merge develop in to sb_SCI-7815 [SCI-7815]	2023-04-12 15:46:52 +02:00
artoscinote	e2dc2e31ee	Revert "Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]"	2023-03-21 15:24:40 +01:00
artoscinote	a43c941b50	Merge pull request #5170 from G-Chubinidze/gc_SCI_8147 ... Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]	2023-03-21 15:18:37 +01:00
Giga Chubinidze	9dcd2f1500	Cursor position improvements, focused fields - part 2 [SCI-8147]	2023-03-21 13:17:44 +04:00
Alex Kriuchykhin	87153b8899	Improve filtering of user supplied data in the input and text fields [SCI-8095] (#5106)	2023-03-09 11:38:47 +01:00
sboursen-scinote	9852c4507e	Fix typo [SCI-7815]	2023-02-16 20:21:46 +01:00
ajugo	aa3ea584a9	Fix visibility of archived by and on column in repository [SCI-7674][7924] (#4973)	2023-02-14 16:27:17 +01:00
artoscinote	b9be286802	Merge pull request #4908 from sboursen-scinote/sb_SCI-7674 ... Inventories: archived by and archived on seen on active item list [SCI-7674]	2023-02-07 10:23:28 +01:00
sboursen-scinote	408dd7dcd8	Reinitialize the Table when switching the View from archived to active [SCI-7674]	2023-01-30 15:33:08 +01:00
sboursen-scinote	4be094680a	Enable inventories datatable settings saving in localStorage [SCI-7818]	2023-01-27 14:44:39 +01:00
Oleksii Kriuchykhin	e51cf28ec6	Improve loading speed of inventory table [SCI-7638]	2023-01-18 11:10:43 +01:00
artoscinote	c4ba723998	Merge pull request #4662 from artoscinote/ma_SCI_7534 ... Make deferred SmartAnnotation loading optional [SCI-7534]	2022-11-29 13:51:28 +01:00
Martin Artnik	76de2d1380	Make deferred SmartAnnotation loading optional [SCI-7534]	2022-11-29 13:47:52 +01:00
Anton	8ef5a742f6	Fix tooltip for clear reminders [SCI-7472]	2022-11-28 10:11:06 +01:00
artoscinote	1a700b8359	Merge pull request #4650 from artoscinote/ma_SCI_7460 ... Fix disabling item edit button [SCI-7460]	2022-11-25 10:36:20 +01:00
Martin Artnik	6fe86f2015	Fix disabling item edit button [SCI-7460]	2022-11-25 10:24:24 +01:00
artoscinote	7d53027530	Merge pull request #4641 from G-Chubinidze/gc_SCI_7492 ... Missing navigate away pop up at inventory page [SCI-7492]	2022-11-23 14:14:35 +01:00
Giga Chubinidze	f78cf58552	pointer events value change	2022-11-23 17:12:25 +04:00
Giga Chubinidze	dac093823e	few double quotes changed to single quotes	2022-11-23 16:08:43 +04:00
Giga Chubinidze	3b8a58b7db	fixed code according to hound styling comments	2022-11-23 16:05:56 +04:00
Giga Chubinidze	47d593f0db	Missing navigate away pop up at inventory page [SCI-7492]	2022-11-23 15:38:01 +04:00
Anton	961b39159e	Fix tooltip on new button in inventory [SCI-7472]	2022-11-22 11:05:57 +01:00
artoscinote	92d446b43d	Merge pull request #4628 from artoscinote/ma_SCI_7473 ... Fix inventory multiline file uploads [SCI-7473]	2022-11-21 12:59:40 +01:00
Martin Artnik	5d41ea5fa7	Disable instead of hide edit button when selected items not on page [SCI-7460]	2022-11-21 11:58:15 +01:00
Martin Artnik	95348b82e8	Fix inventory multiline file uploads [SCI-7473]	2022-11-21 11:47:46 +01:00
Anton	c0141137eb	Fix merge issue [SCI-7471]	2022-11-10 11:46:14 +01:00
artoscinote	0994c4a25b	Merge branch 'develop' into ma_SCI_6982	2022-11-10 11:04:57 +01:00
Anton	40022a7012	Add initial VUE container for print dialog [SCI-7193]	2022-09-23 14:07:52 +02:00
Anton	0c596bb701	Merge branch 'develop' into features/label-templates	2022-09-15 10:40:17 +02:00
Anton	47e20d1b27	Add ability to disable zebra printers [SCI-7148]	2022-09-05 12:37:03 +02:00
artoscinote	c106c2d997	Add active reminders filter [SCI-7004] (#4280)	2022-08-09 10:23:40 +02:00
artoscinote	ee9c877929	Implement BS tooltips on repository toolbar [SCI-6691] (#4309)	2022-08-04 11:05:55 +02:00
Oleksii Kriuchykhin	382d54320e	Improve repository table loading speed [SCI-7002]	2022-07-25 15:39:11 +02:00
Martin Artnik	6227b1f5a1	Added edit overlays, disable more controls [SCI-6983]	2022-07-19 14:22:40 +02:00
Martin Artnik	98b3627219	Implement multiline editing in repositories [SCI-6982]	2022-07-19 12:24:33 +02:00
ajugo	0d8d1270ce	Disable double clikc on new repository row [SCI-6977] (#4255)	2022-07-15 10:14:26 +02:00
ajugo	a5065b82cb	Show error for broken file in repository row [SCI-6838] (#4146)	2022-06-08 13:35:06 +02:00
ajugo	054ce72d25	Add handle for going over storage limit for inventories [SCI-6604] (#4120)	2022-05-26 13:19:38 +02:00
Anton	2f20109b0d	Fix stock consumption rounding [SCI-6807]	2022-05-09 11:51:39 +02:00
artoscinote	98ac1c126f	Stock editing and reminder fixes [SCI-6803] (#4078) ... * Fix stock editing after adding new value [SCI-6803] * Don't load reminders for snapshots [SCI-6803]	2022-05-09 11:20:38 +02:00
artoscinote	ac45edb14c	Added validations for date(time) column reminder [SCI-6775] (#4063)	2022-04-28 15:30:20 +02:00
artoscinote	da8250dba8	Stock / stock consumption display fixes [SCI-6771] (#4054)	2022-04-25 15:23:12 +02:00
Anton	b56f11fc18	Add negative validation for treshold [SCI-6743]	2022-04-25 12:18:22 +02:00
aignatov-bio	4d429b28a8	Merge branch 'develop' into ai-sci-6743-add-negative-validation-for-stock-modal-and-consumption-modal	2022-04-22 11:15:04 +02:00
artoscinote	f9357611a0	Update stock value without reloading the table [SCI-6745] (#4041)	2022-04-22 11:13:00 +02:00
Anton	f8f5791c62	Add negative validation for stock [SCI-6743]	2022-04-20 15:11:05 +02:00
aignatov-bio	918a11a0b0	Fix decimal render function [SCI-6742] (#4037) ... Co-authored-by: Anton <anton@scinote.net>	2022-04-20 11:07:37 +02:00
artoscinote	4daf01feee	Fix snapshot consumption display [SCI-6734] (#4035)	2022-04-20 11:07:26 +02:00
Anton	1be5ba9dd0	Fix stock modal add/remove value preset value [SCI-6740]	2022-04-19 13:44:53 +02:00
Anton	ed49e93a6a	Highlight negative stock in modal with red [SCI-6729]	2022-04-15 12:08:29 +02:00
artoscinote	30ee6cd40c	Refactor and fix display of stock warnings and stock consumption [SCI-6734] (#4021) ... * Refactor and fix how stock consumption is displayed [SCI-6734] * Refactor and fix display of stock warnings [SCI-6734]	2022-04-14 14:27:31 +02:00
artoscinote	dd0661a462	Change the way setting stock works [SCI-6730] (#4018)	2022-04-13 14:22:22 +02:00
ajugo	986e817fdc	Removed autofocus clear on open reminder flyout [SCI-6690] (#4003) ... * Removed clear autofocus on open reminder flyout [SCI-6690] * Fix hound [SCI-6690]	2022-04-08 18:08:55 +02:00
aignatov-bio	3a4cab9d0a	Stock modal UX fixes [SCI-6714] (#3998) ... Co-authored-by: Anton <anton@scinote.net>	2022-04-08 11:09:37 +02:00
aignatov-bio	4df8faec7e	Fix css stock modal [SCI-6675] (#3989) ... Co-authored-by: Anton <anton@scinote.net>	2022-04-05 10:25:47 +02:00
aignatov-bio	a32dd54a6e	Toolbar fixes [SCI-6670] (#3973) ... Co-authored-by: Anton <anton@scinote.net>	2022-03-31 14:04:00 +02:00
aignatov-bio	ca53c3058a	Stock modal bugs [SCI-6667] (#3970) ... Co-authored-by: Anton <anton@scinote.net>	2022-03-30 14:03:07 +02:00
artoscinote	36fbfcab2f	Implement hide all repository reminders button [SCI-6505] (#3940)	2022-03-30 10:54:55 +02:00
aignatov-bio	673f8c1a2a	Fix multiple stock bugs [SCI-6651] (#3959) ... Co-authored-by: Anton <anton@scinote.net>	2022-03-28 12:43:09 +02:00
aignatov-bio	c6c073c750	Add micro interactions for stock modal [SCI-6625] (#3947) ... Co-authored-by: Anton <anton@scinote.net>	2022-03-22 14:35:27 +01:00
artoscinote	297cd02da7	Handle locked stock consumption state [SCI-6608] (#3942)	2022-03-18 15:02:15 +01:00
aignatov-bio	fecaafecf9	Refactor repository toolbar [SCI-6545] (#3943) ... Co-authored-by: Anton <anton@scinote.net>	2022-03-18 14:10:34 +01:00
ajugo	a89244c537	Displaying low stock warning [SCI-6497] (#3912) ... * Low stock warning [SCI-6497 * Fix some bugs [SCI-6497] * Fix to long line [SCI-6497] * Clean not needed information in renderes [SCI-6497]	2022-03-16 15:06:52 +01:00
ajugo	d1610fba53	Low stock flyout reminders [SCI-6502] (#3932) ... * Display low stock flyout reminder [SCI-6502] * Display low stock flyout reminder [SCI-6502] * Adapt showing stock reminders for every bell icon click [SCI-6502] * Correct hound error [SCI-6502] * Fix event registration for fetching reminder data [SCI-6502] * Fix event registration for fetching reminder data [SCI-6502] * Fix hound [SCI-6502] * Remove not needed line [SCI-6502] * Add reminder template [SCI-6502] * Add clearing messages [SCI-6502]	2022-03-15 10:24:35 +01:00
Anton	8b8e2c6d92	Merge branch 'develop' into features/stock-management	2022-03-14 11:56:38 +01:00
aignatov-bio	bf058dea03	Add flyout for repository reminders [SCI-6501] (#3926) ... Co-authored-by: Anton <anton@scinote.net>	2022-03-09 15:09:49 +01:00
aignatov-bio	10743921d4	Add reminders to stock modal [SCI-6557] (#3917) ... Co-authored-by: Anton <anton@scinote.net>	2022-03-09 14:19:15 +01:00
aignatov-bio	d89ea7d77f	Add red dot for date/datetime reminder [SCI-6499] (#3924) ... Co-authored-by: Anton <anton@scinote.net>	2022-03-09 14:18:34 +01:00
artoscinote	d577fcc824	Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] (#3911) ... * Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] * Implement bell icon [SCI-6500] * Refactor reminder cells scope [SCI-6554]	2022-03-09 14:13:48 +01:00
artoscinote	20ef08907a	Stock column fixes [SCI-6455] (#3878) ... * Fix issues with stock column management [SCI-6455] * Refactor stock column in datatables [SCI-6455]	2022-03-08 14:52:45 +01:00
artoscinote	8d096df826	Fix reload of edit column index [SCI-6598] (#3918)	2022-03-07 17:11:56 +01:00
aignatov-bio	577f449b95	Fix repository table header [SCI-6559] (#3906) ... Co-authored-by: Anton <anton@scinote.net>	2022-02-28 14:19:31 +01:00
Alex Kriuchykhin	fa6aeac1d9	Fix saving of time range values [SCI-6570] (#3892)	2022-02-24 09:43:15 +01:00
artoscinote	c097b321a7	Fix multiple saving bug for repository filters [SCI-6523] (#3890)	2022-02-23 14:30:28 +01:00
Alex Kriuchykhin	6b51b8a35c	Fix handling of date values in repositories [SCI-6551] (#3877)	2022-02-21 12:08:35 +01:00
artoscinote	cce6a17e8f	Perserve save filters button on toolbar reload [SCI-6553] (#3874)	2022-02-21 10:09:59 +01:00
Alex Kriuchykhin	9c4fca1b86	Implement repository snapshots displaying on assigned items full view modal [SCI-6442] (#3862)	2022-02-16 09:40:48 +01:00
aignatov-bio	f2e4c579af	Multiple UX fixes for filters [SCI-6525] (#3858) ... Co-authored-by: Anton <anton@scinote.net>	2022-02-15 15:03:25 +01:00
Alex Kriuchykhin	0ce6f43cbf	Fix inventory table custom error messages [SCI-6532] (#3855)	2022-02-15 14:37:26 +01:00
artoscinote	af011a3bb8	Fixed full view assigned items modal stock consumption (#3846)	2022-02-14 10:42:48 +01:00
aignatov-bio	97898fef7a	Add error handling for saving filters [SCI-6488] (#3835) ... * Add error handling for saving filters [SCI-6488] * Refactor and clean up filter element validations [SCI-6488] Co-authored-by: Anton <anton@scinote.net> Co-authored-by: Martin Artnik <martin@scinote.net>	2022-02-11 13:32:27 +01:00
Alex Kriuchykhin	79c32e30ad	Add support of repository snapshots to assigned items section [SCI-6439] (#3828)	2022-02-11 10:46:19 +01:00
artoscinote	bc5822de7b	Added error messges for missing search columns/values [SCI-6483] (#3824) ... * Added error messges for missing search columns/values [SCI-6483]	2022-02-11 10:24:29 +01:00
artoscinote	bac8fbbe58	Disable filter save button on submit [SCI-6523] (#3833)	2022-02-11 10:14:19 +01:00
aignatov-bio	8604319c1b	Add front-end validation for comments field [SCI-6464] (#3829) ... Co-authored-by: Anton <anton@scinote.net>	2022-02-10 10:55:58 +01:00
Alex Kriuchykhin	f66b89c7bb	Add permissions checking to assigned items view on tasks [SCI-6435] (#3801)	2022-02-04 14:24:15 +01:00
artoscinote	f1e04cc604	Fix appearance of members pagination, copy fix [SCI-6265] (#3792)	2022-02-02 10:41:29 +01:00
artoscinote	cdbf1f5fa0	Implement stock management activities [SCI-6452] (#3810) ... * Implement stock management activities [SCI-6452] * PR code fixes [SCI-6452]	2022-02-02 10:33:02 +01:00
artoscinote	dd8b38604f	Filter loading/saving fixes [SCI-6475] (#3803) ... * Filter loading/saving fixes [SCI-6475] * More bugfixes & code improvements [SCI-6475] * Fix loading user filter [SCI-6475]	2022-02-01 14:37:13 +01:00
aignatov-bio	2c88843924	Task stock consumption modal[SCI-6444][SCI-6445] (#3798) ... Add main logic for consumption on task [SCI-6444] Co-authored-by: Anton <anton@scinote.net>	2022-01-28 11:10:56 +01:00
aignatov-bio	371d5f0636	Add current/new amount section to stock [SCI-6416] (#3791) ... Co-authored-by: Anton <anton@scinote.net>	2022-01-26 10:28:43 +01:00
Alex Kriuchykhin	d2b5db13e9	Add stock and consumption to assigned items section [SCI-6434] (#3793)	2022-01-25 12:12:55 +01:00
artoscinote	95a36b6870	Implemented stock management modal [SCI-6417] (#3788) ... * Implement inventory stock management modal [SCI-6417] * Add generalized validation mechanic, some bugfixes [SCI-6417] * Fix permission check and method name in RepositoryStockValue [SCI-6417]	2022-01-20 12:44:57 +01:00
aignatov-bio	05547da457	Add stock table renders [SCI-6412] (#3787) ... Co-authored-by: Anton <anton@scinote.net>	2022-01-19 13:19:56 +01:00
aignatov-bio	01f1b5bd10	Add stock column type (#3786) ... * Add stock column type * Create new stock column [SCI-6410] * Small fixed for stock column [SCI-6410] * Add stock column validations [SCI-6410] Co-authored-by: Anton <anton@scinote.net>	2022-01-18 13:17:05 +01:00
aignatov-bio	3e85cc0b4a	Add UI for saving filters [SCI-6231] (#3768) ... * Add UI for saving filters [SCI-6231] * Fix ajax for deleting filters [6231] Co-authored-by: Anton <anton@scinote.net> Co-authored-by: Martin Artnik <martin@scinote.net>	2022-01-12 14:39:42 +01:00
artoscinote	3f87d250ce	Implement saving repository filters [SCI-6230] (#3748) ... * Implement saving repository filters [SCI-6230] * Remove unnecessary logging [SCI-6230] * Refactor filter saving [SCI-6230] * Remove unnecessary files, linter fixes [SCI_6230]	2022-01-05 15:02:09 +01:00
Oleksii Kriuchykhin	738da6094f	Add advanced filters to repository datatable service [SCI-6210]	2021-12-21 12:38:52 +01:00
artoscinote	49ec3edb49	Add apply filters functionality to FE [SCI-6229] (#3742)	2021-12-15 12:48:28 +01:00
aignatov-bio	12fadb9c25	Add basic structure for repository filters [SCI-6211] (#3698) ... * Add container for inventory filters [SCI-6211] * Add basic structure for filters [SCI-6211] * Add i18n and css for filters dropdown [SCI-6211] * Fix markup Co-authored-by: Anton <anton@scinote.net>	2021-11-25 20:34:22 +01:00
Martin Artnik	ade1385392	Merge branch 'develop' into features/bmt-search	2021-09-06 10:51:04 +02:00
Martin Artnik	6d92af4b2f	Made barcode search globally available [SCI-6022]	2021-08-30 14:41:31 +02:00
Martin Artnik	896f0ce1e3	Implemented applying BMT filters [SCI-5980]	2021-08-30 10:49:15 +02:00
aignatov-bio	958ee92db7	Add BMT filters interactions [SCI-5955] (#3478) ... * Add BMT filters interactions [SCI-5955] * Small fixes [SCI-5955]	2021-08-30 10:49:14 +02:00
aignatov-bio	7621deeb2a	Small label printers fixes [SCI-6021][SCI-6024] (#3502)	2021-08-23 13:58:16 +02:00
aignatov-bio	8d033274e4	Add barcode scanners support [SCI-5929] (#3456)	2021-07-27 22:01:08 +02:00
aignatov-bio	d373c174ee	Add print label button to repository toolbar (#3453)	2021-07-27 12:34:13 +02:00
aignatov-bio	ef57489cd9	Update repositories sidebar [SCI-5329] (#3031) ... * Update repositories sidebar [SCI-5329]	2021-01-06 10:13:10 +01:00
Oleksii Kriuchykhin	67b3f853d7	Merge branch 'develop' into features/folders	2020-12-18 14:51:21 +01:00
aignatov-bio	329a5bff0b	Fix repository text field rendering [SCI-5304] (#3015)	2020-12-15 12:23:19 +01:00
Mojca Lorber	d7e3b57d0d	[SCI-5240] Implement Create new folder function	2020-12-01 09:59:08 +01:00
aignatov-bio	483ff8f1f2	Merge pull request #2964 from biosistemika/features/office-file-previews ... Features/office file previews merge branch	2020-11-19 11:11:39 +01:00
Oleksii Kriuchykhin	8eec4e4b59	Add browser notification for unsaved data when navigating away for tables on Task [SCI-5047]	2020-11-02 22:19:33 +01:00
aignatov-bio	d99e279ecc	Add gallery to file preview	2020-10-29 14:30:26 +01:00
aignatov-bio	c56f7912ef	Update file preview	2020-10-29 14:23:32 +01:00
Urban Rotnik	b6495becdb	Set stateDuration to 0	2020-08-24 15:51:35 +02:00
Urban Rotnik	ac3c06d882	Merge pull request #2741 from aignatov-bio/ai-sci-4748-add-export-for-assinged-items ... Add export for assigned items [SCI-4748]	2020-08-03 11:30:31 +02:00
Urban Rotnik	51ca828399	Fix undefined text cell	2020-07-22 17:27:36 +02:00
aignatov-bio	e69e3ea8d3	Add export for assigned items	2020-07-17 15:17:09 +02:00
Mojca Lorber	9464d2753d	Fix naming of filter field for repositories tables	2020-07-15 10:52:47 +02:00
Mojca Lorber	cea9e6f956	Add check for search state	2020-07-10 15:39:01 +02:00
aignatov-bio	50714eb59d	Disable inventories table initialization on turbolinks preview	2020-07-10 11:05:27 +02:00
mlorb	0f43f6a479	Merge pull request #2721 from mlorb/ml-sci-4788-v2 ... Fix bug with not hidden navigation on inventory page [SCI-4788]	2020-07-09 15:12:44 +02:00
mlorb	3f44f44cbe	Merge pull request #2711 from mlorb/ml-sci-4810 ... Hide inventory buttons and fix css of disabled button [SCI-4810]	2020-07-09 15:11:02 +02:00
Mojca Lorber	1a2b321523	Fix bug with not hidden navigation on inventory page	2020-07-09 14:09:55 +02:00
aignatov-bio	6245e19069	Merge pull request #2718 from biosistemika/master ... Merge master to develop	2020-07-09 12:56:31 +02:00
mlorb	73e2654d78	Merge pull request #2701 from mlorb/ml-sci-4793 ... Add empty states to inventories datatable and fix filtering bug [SCI-4793]	2020-07-09 11:49:16 +02:00
mlorb	d9038e6f7f	Merge branch 'develop' into ml-sci-4810	2020-07-09 11:46:54 +02:00