2081 commits

Author	SHA1	Message	Date
Ivan Kljun	60001e282c	Merge remote-tracking branch 'upstream/features/asset-sync' into SCI-9862-ik	2024-01-04 13:27:28 +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
G-Chubinidze	84c53cb5f5	Merge branch 'features/asset-sync' into gc_SCI_9710	2024-01-03 18:23:25 +04:00
Soufiane	cbe1eef8af	Add the ability to unlink parent/child items [SCI-9712] (#6725)	2024-01-03 14:15:30 +01:00
Martin Artnik	bd2d843684	Merge pull request #6822 from ivanscinote/SCI-9838-ik ... Implement 'Open locally' button and dropdown for thumbnail [SCI-9838]	2024-01-03 11:46:44 +01:00
Giga Chubinidze	cc8a10edb0	"Move" feature for multiple selected tasks and experiments (bulk action)	2023-12-29 12:53:46 +04:00
Soufiane	5ca33bb96a	Add activities for item relationships [SCI-9718] (#6788)	2023-12-21 12:33:06 +01:00
Gregor Lasnibat	3e4ccbcc75	(fix) Item card minor issue [SCI-9814_v2] (#6846)	2023-12-21 11:55:12 +01:00
Anton	79969492dd	Replace tasks table [SCI-9801]	2023-12-20 17:47:09 +01:00
wandji	a4e573e02f	Rename relationships inventory column SCI-[9905] (#6850)	2023-12-20 16:24:39 +01:00
Giga Chubinidze	9ff30b2795	Add 12 well plate option - "Insert content" select menu (protocol, results, protocol template)	2023-12-18 12:32:33 +04:00
Ivan Kljun	455fdd2cd4	Show modal when no predefined app for opening asset locally [SCI-9862]	2023-12-14 16:19:15 +01:00
Oleksii Kriuchykhin	372ef32f03	Merge branch 'develop' into features/inventory-items-relationships	2023-12-14 11:28:04 +01:00
Ivan Kljun	f1dd767f35	Implement 'Open locally' button and dropdown for thumbnail [SCI-9838]	2023-12-14 11:11:12 +01:00
Gregor Lasnibat	eb1401789e	Merge pull request #6818 from lasniscinote/gl_SCI_9845 ... (fix) Wording improvments for the 'Delete attachments' modal [SCI-9845]	2023-12-14 09:01:47 +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
Gregor Lasnibat	f5791f5fa7	(fix) Wording improvments for the 'Delete attachments' modal [SCI-9845]	2023-12-13 15:36:37 +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
Anton	985dddef17	Finish experiment table [SCI-9800]	2023-12-11 15:57:45 +01:00
Soufiane	a37d4ead47	Improve wording in Protocol templates and Inventory [SCI-9685] (#6789)	2023-12-11 13:58:04 +01:00
Anton	75f7437001	Fix markup	2023-12-11 09:26:13 +01:00
Giga Chubinidze	d93b4c6b78	Update terminology for opening attached files	2023-12-08 12:25:28 +04:00
Anton	65e9e5abb4	Merge branch 'develop' into features/new-datatable	2023-12-07 09:51:45 +01:00
Anton	687bac024a	Migrate access modal to VUE [SCI-9799]	2023-12-06 14:12:22 +01:00
Martin Artnik	66feec3074	Merge branch 'develop' into features/asset-sync	2023-12-06 11:23:31 +01:00
G-Chubinidze	e1ff625351	Merge branch 'features/asset-sync' into gc_SCI_9710	2023-12-06 11:48:18 +04:00
Martin Artnik	5ce927ce37	Merge pull request #6763 from ivanscinote/SCI-9775-ik ... Fix wording for my_module_due_date_reminder [SCI-9775]	2023-12-05 13:23:17 +01:00
Ivan Kljun	2ddcbe9824	Fix wording for my_module_due_date_reminder [SCI-9775]	2023-12-05 13:19:35 +01:00
Martin Artnik	235d94e1cf	Implement SciNote edit button with checks and info [SCI-9756]	2023-12-05 12:35:55 +01:00
Ivan Kljun	472a095a6a	Remove 'There is a change on assigned task' notification category [SCI-9767]	2023-12-05 10:55:54 +01:00
Ivan Kljun	dde7c512a9	Fix translations for notif (Due date, Date/Date&Time, Low stock) [SCI-9775]	2023-12-04 14:13:16 +01:00
Anton	9971de5c4c	Finalize projects table	2023-12-01 09:56:14 +01:00
Giga Chubinidze	1415044054	Wording of subgroups of notifications in UI [SCI-9798]	2023-12-01 12:35:16 +04:00
Martin Artnik	a5bbc190f9	Merge branch 'develop' into features/inventory-items-relationships	2023-11-29 15:16:22 +01:00
Anton	be9c6c759f	Remove legacy [SCI-9680]	2023-11-29 11:36:44 +01:00
Gregor Lasnibat	3dd15ed1a5	Implement the 'Add relationship' modal, only front end [SCI-9671]	2023-11-28 12:44:57 +01:00
Martin Artnik	f3ee9a854f	Merge branch 'develop' into features/notification-revamp	2023-11-28 10:26:51 +01:00
Martin Artnik	54fe02d289	Merge pull request #6718 from G-Chubinidze/gc_SCI_9390 ... Smaller changes in activity grouping [SCI-9390]	2023-11-27 14:11:04 +01:00
Martin Artnik	5aff062a76	Copy changes for report wizard [SCI-9693]	2023-11-27 12:56:33 +01:00
Giga Chubinidze	cc48087beb	Smaller changes in activity grouping [SCI-9390]	2023-11-27 15:54:14 +04:00
Oleksii Kriuchykhin	fa35de6a58	Merge branch 'develop' into features/inventory-items-relationships	2023-11-24 14:04:18 +01:00
Oleksii Kriuchykhin	9adad3139c	Merge branch 'features/inventory-item-card-edit' into develop	2023-11-23 11:39:08 +01:00
Oleksii Kriuchykhin	01219f09eb	Merge branch 'develop' into features/inventory-items-relationships	2023-11-23 11:08:42 +01:00
Anton	8a0dd0258e	Merge branch 'develop' into features/new-datatable	2023-11-23 10:47:58 +01:00
Anton	0ec734b467	Merge branch 'develop' into features/notification-revamp	2023-11-23 10:05:42 +01:00
Giga Chubinidze	d0877de13c	Add activity for updating a file via AssetSync [SCI-9710]	2023-11-23 04:12:38 +04:00
Gregor Lasnibat	6db47192fd	Merge pull request #6686 from lasniscinote/gl_SCI_9683 ... (fix) Item card behavior in cases of error states [SCI-9683]	2023-11-22 16:16:10 +01:00
Martin Artnik	18b5222227	Merge branch 'features/inventory-item-card-edit' into develop	2023-11-22 15:09:10 +01:00
Gregor Lasnibat	1ff3e43171	(fix) Item card behavior in cases of error states [SCI-9683]	2023-11-22 14:15:24 +01:00
Martin Artnik	720eceb59f	Merge pull request #6557 from artoscinote/ma_SCI_9608 ... Implement general notification mailer [SCI-9608]	2023-11-21 14:49:06 +01:00
Martin Artnik	e0cd9cf9fd	Implement general notification mailer [SCI-9608]	2023-11-21 14:21:55 +01:00
Anton	25048ddd4e	Fix filters and missing barcode icon [SCI-9748]	2023-11-21 13:51:16 +01:00
wandji	7a916b7d11	Add activities to inventories [SCI-5578] (#6588) ... * Add activities for stock consumption and inventories export and inventory item file edit [SCI-5578] * Improve check for creating inventory item asset activity [5578] * Improve query for inventory items in consumption export [SCI-5578]	2023-11-20 13:37:57 +01:00
Alex Kriuchykhin	43b8f97126	Improve handling of unshared inventories and unassigned items for stock ledger records [SCI-9504] (#6565)	2023-11-20 13:24:31 +01:00
Anton	13eca7e035	Fix time format and picker position [SCI-9706]	2023-11-15 16:18:00 +01:00
Oleksii Kriuchykhin	fdb4e93e16	Merge branch 'features/inventory-item-card-edit' into features/inventory-items-relationships	2023-11-14 15:28:57 +01:00
Soufiane	12006bc286	Add relationships section to the items sidebar [SCI-9668] (#6623)	2023-11-14 14:04:46 +01:00
wandji	73cb2528c8	Add repository_row_connection controller and actions [SCI-9672] (#6633) ... * Add repository_row_connection controller and actions [SCI-9672]	2023-11-14 14:02:26 +01:00
Soufiane	f80046418a	Add relationship columns to inventory exports [SCI-9673] (#6634)	2023-11-14 11:57:11 +01:00
Martin Artnik	fd159f0adc	Merge pull request #6599 from G-Chubinidze/gc_SCI_9625 ... Enable access to "SciNote File Editor" app installers via the SciNote web app [SCI-9625]	2023-11-14 09:44:35 +01:00
wandji	94a2f2e6fd	Update placeholder text for date time field item card [SCI-9615] (#6627)	2023-11-13 17:07:51 +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	3211fa7cce	Merge branch 'features/new-datatable' of github.com:scinote-eln/scinote-web into features/new-datatable	2023-11-09 11:36:44 +01:00
Giga Chubinidze	39ce9c1781	Enable access to "SciNote File Editor" app installers via the SciNote web app [SCI-9625]	2023-11-08 12:22:34 +04:00
Gregor Lasnibat	68dc671f06	Fixed Translation error for Error message on item card [SCI-9601]	2023-11-03 11:17:55 +01:00
Martin Artnik	f015c8c56e	Create a copy of the synced file in case of conflict [SCI-9640]	2023-11-03 09:46:05 +01:00
Martin Artnik	3a3d62a1be	Merge branch 'develop' into features/asset-sync	2023-11-02 11:28:17 +01:00
wandji	4fd3933bdb	Fix wrong placeholders for item card fields in edit mode [SCI-9615] (#6553) ... * Fix wrong placeholders for item card fields in edit mode [SCI-9615] * Refactor date time range className [SCI-9615]	2023-10-30 17:30:23 +01:00
Oleksii Kriuchykhin	ee76488f32	Merge branch 'develop' into features/inventory-item-card-edit	2023-10-27 14:25:32 +02:00
Martin Artnik	6308779668	Merge branch 'develop' into features/notification-revamp	2023-10-27 12:04:07 +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
Martin Artnik	5a073b1364	Merge branch 'develop' into features/bugfixes-and-css	2023-10-27 10:29:13 +02:00
Anton	fded38a5a6	Fix i18n for clipboard modal [SCI-9588]	2023-10-26 13:32:17 +02:00
ajugo	7c54509c58	Add editing of asset files for repository items sidebar [SCI-9413] (#6448)	2023-10-26 12:59:11 +02:00
Anton	0ffd3dcee3	Add image paster [SCI-9588]	2023-10-26 12:15:30 +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
ajugo	a98d86e9b8	Add activities for cell editing on the new item card [SCI-9423] (#6465)	2023-10-24 16:22:10 +02:00
Soufiane	809aaa8aa3	Implement field editing for the new item card [SCI-9412] (#6421) ... - Created new checklist component. - updated the functionality of the select-search component. - Name field. - Text fields. - Numeric fields. - List fields. - Status fields. - Checklist fields.	2023-10-24 15:49:37 +02:00
Anton	3dd36e1dda	Add drag n drop to results [SCI-9576]	2023-10-19 15:58:20 +02:00
Oleksii Kriuchykhin	ae7995fee2	Merge branch 'develop' into features/inventory-item-card-edit	2023-10-19 12:59:45 +02:00
Martin Artnik	a952f3ba70	Implement low stock notification [SCI-9522]	2023-10-19 11:33:40 +02:00
sboursen-scinote	885b66504b	FIX no custom columns placeholder [SCI-9529]	2023-10-19 10:53:18 +02:00
Martin Artnik	fb9204df64	Merge branch 'develop' into features/bugfixes-and-css	2023-10-18 14:51:35 +02:00
Giga Chubinidze	f268a0cab0	Attachments renamed to Files [SCI-9505]	2023-10-17 11:33:29 +04:00
wandji	c8359cdf3a	Add controller action to update inventory item cell data [SCI-9478] (#6379)	2023-10-16 17:43:53 +02:00
Gregor Lasnibat	3b4fbc944f	Added archived columns [SCI-9469]	2023-10-16 13:02:28 +02:00
Gregor Lasnibat	57bfe0036b	Fix Rename the buttons Show/Hide in multiline text fields [SCI-9439] (#6444)	2023-10-16 10:12:21 +02:00
Anton	225193387a	Update notifications settings saving	2023-10-16 09:41:38 +02:00
Martin Artnik	1912337376	Merge branch 'features/notification-revamp' into features/notifications-improvements	2023-10-13 14:55:16 +02:00
Gregor Lasnibat	b5ece3429f	Fixed missing inventory columns on item card [SCI-9469] (#6416)	2023-10-13 09:51:50 +02:00
ajugo	04a898760a	Add assign button to item cards [SCI-9158] (#6326)	2023-10-12 15:46:13 +02:00
wandji	45cfe77ef7	Add qr code and print label to item card [SCI-9471 (#6364) ... * Add qr acode and print label to item card [SCI-9471 * Remove jQuery handler for setting barcode image src [SCI-9471]	2023-10-12 15:10:54 +02:00
Anton	c2b85d8981	Add new general notifications structure [SCI-9511]	2023-10-12 11:51:01 +02:00
Oleksii Kriuchykhin	e08304d0cd	Merge branch 'develop' into features/inventory-item-card-edit	2023-10-11 10:51:51 +02:00
wandji	d236ba0a5b	Add reminders to item card [SCI-9154] (#6285) ... * Add reminders to item card [SCI-9154] * Refactor item card reminder component [SCI-9154]	2023-10-11 09:35:10 +02:00
Andrej	79118effa7	Merge branch 'develop' into features/october-release	2023-10-10 11:09:04 +02:00
Martin Artnik	a9b629bdf7	Copy fixes [SCI-9440]	2023-10-09 11:40:12 +02:00
Martin Artnik	9bf5903c54	Merge pull request #6384 from aignatov-bio/ai-sci-9491-fix-acitvity-type-selector ... Fix activity type selector [SCI-9491]	2023-10-09 09:42:50 +02:00
Martin Artnik	1df8ad6f87	Merge pull request #6383 from G-Chubinidze/gc_SCI_9424 ... CSS: Various issues [SCI-9424]	2023-10-09 09:41:48 +02:00
Anton	6b6ecf1b43	Fix activity type selector [SCI-9491]	2023-10-09 09:40:42 +02:00
Giga Chubinidze	9b9b486324	CSS: Various issues [SCI-9424]	2023-10-09 11:35:52 +04:00
wandji20	d3c2a7e0ad	Fix issue with timestamps for reports [SCI-9420]	2023-10-05 12:25:08 +01:00
Alex Kriuchykhin	4888ebc3eb	Merge pull request #6346 from rekonder/aj_SCI_9442 ... Add missing wording for failed export email/notifications [SCI-9442]	2023-10-04 15:46:22 +02:00
Andrej	9b1d9823c1	Add missing wording for failed export email/notifications [SCI-9442]	2023-10-04 09:02:35 +02:00
Martin Artnik	64449af994	Merge pull request #6341 from artoscinote/ma_SCI_9441 ... Fix error translations [SCI-9441]	2023-10-03 15:32:00 +02:00
Martin Artnik	2b76fe6b5b	Fix error translations [SCI-9441]	2023-10-03 15:23:49 +02:00
wandji20	285276a59a	Rename item card export label [SCI-9157]	2023-10-03 10:54:45 +01:00
wandji20	2372edcf25	Add export button to item card [SCI-9157]	2023-10-03 10:52:57 +01:00
Martin Artnik	295de7b0bc	Implement default name for results [SCI-9425]	2023-09-29 13:01:41 +02:00
Martin Artnik	a1df2b7b52	Merge pull request #6314 from G-Chubinidze/gc_SCI_9245_V2 ... DOCX not working if result name empty. [SCI-9245]	2023-09-29 12:24:18 +02:00
Giga Chubinidze	0be8ab5839	used i18n	2023-09-29 14:18:45 +04:00
Gregor Lasnibat	f352c7f186	Working on new behaviour for switching between item clicks [SCI-9354] ... Working on scrolling and highlighting [SCI-9354] Item card preload and section title animation [SCI-9354] Added box-shadow [SCI-9354] Refactored logic and styles [SCI-9354] PR fix, added back the missing HighlightComponent [SCI-9354] PR fixes, refactoring [SCI-9354] PR fix [SCI-9354] Fixed scrolling to 'Assigned', highlighting [SCI-9354] PR fix, modular logic, rename [SCI-9354]	2023-09-28 13:21:20 +02:00
Alex Kriuchykhin	ba5ef94764	Merge pull request #6253 from rekonder/aj_SCI_9155_tmp ... Add assigned tasks block to the item card [SCI-9155]	2023-09-27 15:03:20 +02:00
Martin Artnik	d44d29a0fd	Merge pull request #6301 from G-Chubinidze/gc_SCI_9299 ... OVE - Activities related to Task result [SCI-9299]	2023-09-27 12:49:58 +02:00
Martin Artnik	923006dc38	Merge pull request #6300 from aignatov-bio/ai-sci-9382-results-bug-fixes ... Bug fixes [SCI-9382][SCI-9392][SCI-9395][SCI-9396]	2023-09-27 12:41:34 +02:00
Alex Kriuchykhin	9f03d88f12	Merge pull request #6201 from wandji20/wb-SCI-9225 ... Improve UI for stock consumption export [SCI-9225]	2023-09-27 09:21:22 +02:00
Alex Kriuchykhin	dc40b4354d	Merge pull request #6298 from okriuchykhin/ok_SCI_9282 ... Fix column placement in stock consumption export, add missing localization [SCI-9282]	2023-09-27 09:20:00 +02:00
Giga Chubinidze	da70fed43a	OVE - Activities related to Task result [SCI-9299]	2023-09-27 03:45:29 +04:00
Anton	f630b8860b	Bug fixes [SCI-9382][SCI-9392][SCI-9395][SCI-9396]	2023-09-26 16:23:16 +02:00
wandji20	213c752941	Improve UI for for exports in inventory with stock enabled [SCI-9225]	2023-09-26 15:20:18 +01:00
Oleksii Kriuchykhin	efae35816f	Fix column placement in stock consumption export, add missing localization [SCI-9282]	2023-09-26 13:35:02 +02:00
Andrej	1aa9b17b1a	Add relationship column to the inventory [SCI-9356]	2023-09-26 11:12:45 +02:00
Oleksii Kriuchykhin	d69b7cc6e8	Merge branch 'develop' into features/october-release	2023-09-26 11:11:30 +02:00
Anton	2b9ae65a51	Fix selected state for dropdown [SCI-9385][SCI-9276][SCI-9375][SCI-9379]	2023-09-25 15:04:41 +02:00
Anton	bb4349f346	Initial label templates refactor [SCI-9303]	2023-09-25 14:24:22 +02:00
Gregor Lasnibat	4e6646e3f9	Added a missing RepositoryTimeValue component [SCI-9153-v2] ... PR fix [SCI-9153-v2] PR fix 02 [SCI-9153-v2]	2023-09-25 14:02:05 +02:00
Andrej	4e6ccce9dd	Merge branch 'features/october-release' of https://github.com/scinote-eln/scinote-web into aj_SCI_9155_tmp	2023-09-25 11:49:51 +02:00
wandji	7dac5e63be	Add navigation section to item card [SCI-9154] (#6252)	2023-09-25 10:49:09 +02:00
wandji	5314ef14c7	Revert "Add navigation section to item card [SCI-9154] (#6268)" (#6284) ... This reverts commit 7430f2240d.	2023-09-25 10:46:19 +02:00
Martin Artnik	3a22d7715d	Merge branch 'develop' into features/september-release	2023-09-25 10:37:40 +02:00
wandji	7430f2240d	Add navigation section to item card [SCI-9154] (#6268)	2023-09-25 09:53:12 +02:00
Andrej	9ca96145d5	Merge branch 'features/october-release' of https://github.com/scinote-eln/scinote-web into aj_SCI_9155_tmp	2023-09-25 08:05:28 +02:00
Anton	5b434c4e4c	Fixes for new flyout [SCI-9343]	2023-09-23 19:15:35 +02:00
wandji	767c98c101	Add barcode and print label to item card [SCI-9156] (#6269) ... * Add barcode and print label to item card [SCI-9156] * Rename wrong label [SCI-9156]	2023-09-22 16:17:42 +02:00
sboursen-scinote	adc0a460bd	Improve logic for custom logos on error pages [SCI-9147] ... - Switch to dynamic ERB templates. - Move text to I18n	2023-09-22 10:26:32 +02:00
Gregor Lasnibat	1bf2bc6156	Refactoring RepositoryItemSidebar and custom columns [SCI-9153] ... Fixed regular card (without cusotm columns) styles [SCI-9153] Updated API to return column name, working on subcomponents [SCI-9153] TooltipPreview on dynamic file component working [SCI-9153] Finished new item card refactor [SCI-9153] PR fix 01 [SCI-9153] PR fixes 02 [SCI-9153]	2023-09-21 20:18:20 +02:00
Martin Artnik	810e0ffaff	Merge pull request #6261 from G-Chubinidze/gc_SCI_9269 ... CSS: Results revamp issues [SCI-9269]	2023-09-21 10:00:14 +02:00
Giga Chubinidze	eb5d09e2fb	CSS: Results revamp issues	2023-09-21 10:52:41 +04:00
Alex Kriuchykhin	8e1f8296f4	Merge pull request #6243 from rekonder/aj_SCI_9272 ... Fix message for successful import protocol from protocol parser [SCI-9272]	2023-09-20 19:36:12 +02:00
Anton	4cc968bcb2	Filters modal fixes [SCI-9276]	2023-09-20 11:07:48 +02:00
Andrej	b47651750b	Fix message for successful import protocol from protocol parser [SCI-9272]	2023-09-19 15:47:51 +02:00
Andrej	56a57233df	Add assigned tasks block to the item card [SCI-9155]	2023-09-19 15:40:32 +02:00
Giga Chubinidze	01e57e0395	Add activities for moving content between steps and results [SCI-9300]	2023-09-19 03:17:30 +04:00
Oleksii Kriuchykhin	3b170a0c0d	Connect backend to the new item card [SCI-9313]	2023-09-18 16:42:01 +02:00
Andrej	aebea07be4	Change dropdown options for importing protocols [SCI-9288]	2023-09-18 13:15:55 +02:00
Giga Chubinidze	73c1f67510	Missing modal when deleting an archived result [SCI-9291]	2023-09-18 01:28:22 +04:00