5321 commits

Author	SHA1	Message	Date
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
Soufiane	12006bc286	Add relationships section to the items sidebar [SCI-9668] (#6623)	2023-11-14 14:04:46 +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
Anton	66c3a766bd	Fix datetime picker padding	2023-11-13 14:17:45 +01:00
Anton	cf0a1931cd	Merge branch 'develop' into features/datetime-picker	2023-11-13 14:14:09 +01:00
Anton	7e135405c5	Small css changes	2023-11-13 14:13:29 +01:00
wandji	64669dee4d	Increase dataTables_scrollbody width when it has y-overflow [SCI-8610] (#6598)	2023-11-10 14:58:15 +01:00
wandji	67ec9b63f3	Fix overlapping filename in inventory table [SCI-9199] (#6579)	2023-11-10 14:55:43 +01:00
Anton	7048729415	Merge branch 'features/datetime-picker' into features/new-datatable	2023-11-10 13:35:46 +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
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
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	a6b22b958c	Fix datetime picker css	2023-11-07 16:10:17 +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
Gregor Lasnibat	557142f727	CSS: Assigned users dropdown on task details [SCI-9446]	2023-11-07 11:30:57 +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
ivanscinote	e6e7805c29	Apply layout for Grover PDF library [SCI-9566] (#6547)	2023-11-03 13:19:46 +01:00
Martin Artnik	94ff37baf4	Merge pull request #6570 from ivanscinote/SCI-9567-move-report-fonts-to-a-separate-file-for-export ... Move base64 SN-icon-font to reports_pdf.sass.scss [SCI-9567]	2023-11-03 11:04:09 +01:00
ajugo	d82ec3a705	Fix zebra label printing order [SCI-9575] (#6574)	2023-11-03 10:11:19 +01:00
Ivan Kljun	0861b7ac0b	Move base64 SN-icon-font to reports_pdf.sass.scss [SCI-9567]	2023-11-02 13:38:12 +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
sboursen-scinote	b93baeb730	Replace Scinote Icons [SCI-9557]	2023-10-28 12:51:11 +02: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
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	226d189789	Add new datetime pciker [SCI-9127]	2023-10-26 15:01:26 +02:00
Anton	0ffd3dcee3	Add image paster [SCI-9588]	2023-10-26 12:15:30 +02:00
Martin Artnik	2a5b596e2b	Merge pull request #6515 from G-Chubinidze/gc_SCI_9533 ... Text doesn't fit in the flyout when a linked PT has been changed [SCI-9533]	2023-10-26 10:11:02 +02:00
Anton	7515c979dd	Fix dropdown click aways [SCI-9599]	2023-10-25 14:29:08 +02:00
aignatov-bio	ff667a3a2b	Merge pull request #6529 from scinote-eln/features/navigator-resize ... Features/navigator resize	2023-10-25 14:05:14 +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
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
aignatov-bio	060300c785	Merge pull request #6522 from aignatov-bio/ai-sci-9592-fix-protocol-header ... Fix protocol header [SCI-9592]	2023-10-24 13:43:53 +02:00
Anton	d0703f04dc	Fix protocol header [SCI-9592]	2023-10-24 13:41:13 +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
Giga Chubinidze	0d998b3947	Text doesn't fit in the flyout when a linked PT has been changed [SCI-9533]	2023-10-23 08:26:38 +04: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
aignatov-bio	453bdf0082	Merge pull request #6508 from aignatov-bio/ai-sci-9576-add-drag-n-drop-to-results ... Fix drag n drop on results	2023-10-20 09:43:49 +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
Anton	635a4b7fb3	Fix drag n drop on results	2023-10-19 17:41:13 +02: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
aignatov-bio	29ce96b67d	Merge pull request #6496 from aignatov-bio/ai-sci-9518-fix-bottom-toolbar-for-reports ... Fix bottom toolbar for reports [SCI-9518]	2023-10-19 11:31:39 +02:00
Anton	4122876a90	Fix bottom toolbar for reports [SCI-9518]	2023-10-19 10:16:09 +02:00
Martin Artnik	1cf2e31e1f	Merge pull request #6489 from sboursen-scinote/sb_SCI-9549 ... Fix background blurring of stacked modals [SCI-9549]	2023-10-19 10:02:08 +02:00
ivanscinote	8b5f610c07	Fix grid rows layout for experiment table view when no results found [SCI-9482] (#6434)	2023-10-19 09:47:44 +02:00
sboursen-scinote	e0d1841b7b	Fix blurring of stacked modals [SCI-9549]	2023-10-18 17:15:17 +02:00
Martin Artnik	73ec9848ea	Merge pull request #6470 from artoscinote/ma_SCI_9411 ... Fix MarvinJS loading race condition [SCI-9411]	2023-10-18 15:23:21 +02:00
ajugo	965deded98	Fix collapsing/extending containers on shareable results [SCI-9555] (#6476)	2023-10-18 10:15:43 +02:00
Gregor Lasnibat	22c718d61c	Fixed protocol template table header covered by the list [SCI-9520] (#6457)	2023-10-17 16:32:02 +02:00
Martin Artnik	947d5e6744	Fix MarvinJS loading race condition [SCI-9411]	2023-10-17 15:15:11 +02:00
Anton	db3f217bba	Implement acitvity notifications ... [SCI-9512]	2023-10-17 14:59:50 +02:00
ajugo	67008a54d6	Fix item sidebar showing on full view of inventory [SCI-9525] (#6447)	2023-10-16 10:18:22 +02:00
Anton	225193387a	Update notifications settings saving	2023-10-16 09:41:38 +02:00
Martin Artnik	3021297f73	Revert "Refocus on tinymce editor after marvinjs img update [SCI-9515]"	2023-10-13 14:40:52 +02:00
Martin Artnik	9c302f186b	Merge branch 'features/navigator-resize' into SCI-9318-making-navigator-resizable	2023-10-13 10:33:37 +02:00
Martin Artnik	a83235b23c	Merge pull request #6417 from aignatov-bio/ai-sci-9476-update-shared-tasks ... Update css for shared protocol [SCI-9476]	2023-10-13 10:30:48 +02:00
Martin Artnik	118a25e0ab	Merge pull request #6430 from ivanscinote/SCI-9515-click-away-not-working-after-editing-chemical-drawing-in-rtf ... Refocus on tinymce editor after marvinjs img update [SCI-9515]	2023-10-12 16:45:36 +02:00
Ivan Kljun	d80d0af5b8	Refocus on tinymce editor after marvinjs img update [SCI-9515]	2023-10-12 16:35:36 +02:00
ajugo	c3ae813fb9	Remove link from assigned snapshot inventory row for simple view [SCI-9481] (#6405)	2023-10-12 16:30:58 +02:00
ajugo	04a898760a	Add assign button to item cards [SCI-9158] (#6326)	2023-10-12 15:46:13 +02:00
ajugo	4b5c7362e5	Fix opening of the datetime picker direction [SCI-9146] (#6395)	2023-10-12 15:37:23 +02:00
Ivan Kljun	d34d424b0f	Make navigator resizable [SCI-9318]	2023-10-12 14:45:51 +02:00
ajugo	357eebee40	Fix stock export on task [SCI-9477] (#6400)	2023-10-12 14:43:17 +02:00
Anton	84477cad43	Update css for shared protocol [SCI-9476]	2023-10-11 11:41:34 +02:00
Andrej	79118effa7	Merge branch 'develop' into features/october-release	2023-10-10 11:09:04 +02:00
Giga Chubinidze	cad028bd1a	CSS: Various issues on task page [SCI-9473]	2023-10-10 12:28:26 +04:00
Martin Artnik	5bd9834e91	Fix issues with project filters [SCI-9492]	2023-10-10 10:12:26 +02:00
Martin Artnik	7a01020a2d	Merge pull request #6389 from aignatov-bio/ai-sci-small-css-fixes ... CSS fixes	2023-10-09 11:34:57 +02:00
Anton	c39ba5afe6	Css fixes	2023-10-09 11:29:28 +02:00
Martin Artnik	e6834d0b74	Merge pull request #6387 from ivanscinote/SCI-9464-missing-content-to-exported-project-report-pdf-docx-file ... Fix pdf reports [SCI-9464]	2023-10-09 11:01:33 +02:00
Ivan Kljun	879b03ad3d	Fix pdf reports [SCI-9464]	2023-10-09 10:49:07 +02:00
Martin Artnik	60acd42614	Merge pull request #6378 from lasniscinote/gl_SCI_9435 ... Not responsive task page [SCI-9435]	2023-10-09 09:14:34 +02:00
Gregor Lasnibat	cce02b29ed	Fixed overflowing text, breaking buttons in new line, figuring out how header stacking works (flickering bug) [SCI-9435] ... Fixed header stack stuttering [SCI-9435] PR fix 01 [SCI-9435]	2023-10-08 16:07:05 +02:00
Martin Artnik	56f53a7ed8	Merge pull request #6366 from lasniscinote/gl_SCI_9463 ... Fixed project filter not saved, red dot missing [SCI-9463]	2023-10-06 15:33:51 +02:00
Gregor Lasnibat	7c7c0b0d88	Working on project filter not saved, red dot missing [SCI-9463] ... Fixed project filters not saved/red dot not showing when applied [SCI-9463] PR fix 01 [SCI-9463]	2023-10-06 15:31:00 +02:00
wandji20	8408b65818	Fix issue with text name when importting protocol eln file [SCI-9490]	2023-10-06 14:19:42 +01:00
Martin Artnik	19c44c50ff	Merge pull request #6363 from artoscinote/ma_SCI_9410 ... Fix attachment issues [SCI-9410]	2023-10-05 16:42:10 +02:00
Martin Artnik	5c7ee78cd6	Fix attachment issues [SCI-9410]	2023-10-05 15:44:41 +02:00
Alex Kriuchykhin	e48fc19546	Merge pull request #6361 from sboursen-scinote/sb_SCI-9468 ... Import from Protocols.io not loading protocols [SCI-9468]	2023-10-05 15:35:44 +02:00
Alex Kriuchykhin	5b39c2f08e	Merge pull request #6258 from sboursen-scinote/sb_SCI-9068 ... FIX: Clicking any link makes a side scrollbar appear on the page [SCI-9068]	2023-10-05 15:33:35 +02:00
Alex Kriuchykhin	b73f88f91c	Merge pull request #6359 from rekonder/aj_SCI_9452 ... Fix opening protocol parser import modal [SCI-9452]	2023-10-05 15:28:18 +02:00
sboursen-scinote	9b24bf9504	Fix Protocols.io modal not loading any protocols [SCI-9468] ... The JavaScript responsible for loading the list was attached to a Partial that by itself was loaded using and AJAX request. Therefore, The JavaScript was not being executed (no page reload). It was thus moved to the parent partial (loaded on page reload) and called when the required HTML is appended to the DOM.	2023-10-05 12:03:05 +02:00
wandji20	6358ad2da4	Fix issue with protocol and result text name [SCI-9420]	2023-10-05 08:08:49 +01:00
Andrej	0a53b2e6bc	Fix opening protocol parser import modal [SCI-9452]	2023-10-04 17:13:27 +02:00
Andrej	0889c40d46	Fix icons and OVE view for attachments [SCI-9445]	2023-10-04 16:18:03 +02:00
Alex Kriuchykhin	e4e4992415	Merge pull request #6338 from sboursen-scinote/sb_SCI-8126-fix3 ... Fix no-result placeholder position for archived project list [SCI-8126]	2023-10-04 15:46:51 +02:00
Martin Artnik	5b29ccd1f9	Merge pull request #6354 from lasniscinote/gl_SCI_9418 ... Fixed edit date/datetime columns range option selection [SCI-9418]	2023-10-04 14:16:27 +02:00
Gregor Lasnibat	6dbc3c5aaa	Fixed edit date/datetime columns range option selection [SCI-9418] ... Fixed edit date/datetime columns range option selection [SCI-9418]	2023-10-04 14:05:51 +02:00
Oleksii Kriuchykhin	421ba27a6f	Merge branch 'release/1.28.0' into develop	2023-10-04 13:19:31 +02:00
Martin Artnik	6f45980648	Merge pull request #6335 from ivanscinote/SCI-9407-css-consumption-modals-assign-to-task-modal-issues ... Fix UI for consumption/edit stock/assign to task modals [SCI-9407]	2023-10-04 12:51:59 +02:00
Martin Artnik	b15cedd198	Merge pull request #6345 from G-Chubinidze/gc_SCI_9438 ... CSS: Incorrect icons on large PDF previews & caret on task activity [SCI-9438]	2023-10-04 12:51:20 +02:00
Giga Chubinidze	5544b0e50e	uniquefied gallery param from js	2023-10-04 14:49:32 +04:00
ivanscinote	a4d0d71f18	Merge branch 'develop' into SCI-9407-css-consumption-modals-assign-to-task-modal-issues	2023-10-04 11:00:33 +02:00
Gregor Lasnibat	edabe117a9	Fix scroll to start when navigating inventory pages [SCI-9393] ... PR fix 01 [SCI-9393]	2023-10-04 10:54:03 +02:00
Martin Artnik	1f5ecfba33	Merge pull request #6344 from G-Chubinidze/gc_SCI_9447 ... Wrong icon on the Export button in bottom toolbar & Manage columns back button [SCI-9447]	2023-10-04 09:25:01 +02:00
Giga Chubinidze	615d6ebbfa	Wrong icon on the Export button in bottom toolbar & Manage columns back button [SCI-9447]	2023-10-04 04:56:17 +04:00
sboursen-scinote	1aaea77070	Add dynamic card placeholder calculation to prevent scrollbars [SCI-9068]	2023-10-03 15:00:26 +02:00
sboursen-scinote	d3fbfc3618	Fix no-result placeholder position for archived project list [SCI-8126]	2023-10-03 14:04:09 +02:00
Ivan Kljun	667025b7c6	Fix UI for consumption/edit stock/assign to task modals [SCI-9407]	2023-10-03 11:12:03 +02:00
Martin Artnik	03d6d99f7e	Merge pull request #6323 from G-Chubinidze/gc_SCI_9332 ... Smart annotation modal: inventory name not correct [SCI-9332]	2023-10-03 10:39:23 +02:00
Alex Kriuchykhin	40b6078ab2	Merge pull request #6312 from rekonder/aj_SCI_9386 ... Refactor export stock consumption modal [SCI-9386]	2023-10-03 10:33:00 +02: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
Giga Chubinidze	f99db28760	using tailwind	2023-10-03 11:04:38 +04:00
Giga Chubinidze	3932b22cd4	Smart annotation modal: inventory name not correct [SCI-9332]	2023-10-02 08:14:16 +04:00
Martin Artnik	6e405d40a6	Refactor datepicker limits [SCI-9338]	2023-09-28 13:33:17 +02: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
Martin Artnik	a499a0f0ea	Merge pull request #6307 from artoscinote/ma_SCI_9338 ... Fix datepicker min/max limits [SCI-9338]	2023-09-27 14:53:55 +02:00
Martin Artnik	99dd94e21f	Fix datepicker min/max limits [SCI-9338]	2023-09-27 14:46:48 +02:00
Martin Artnik	d86da2d145	Merge pull request #6207 from ivanscinote/SCI-9217-eye-icons-out-of-placeholder-placeholder-height ... Fix eye icon placement in password fields [SCI-9217]	2023-09-27 14:19:41 +02:00
Martin Artnik	5da684e959	Merge pull request #6178 from artoscinote/ma_SCI_9277 ... Keep asset image tooltip aspect ratio [SCI-9277]	2023-09-27 13:40:45 +02:00
Martin Artnik	2503266b15	Merge pull request #6304 from sboursen-scinote/sb_SCI-8126-fix2 ... Fix no-result placeholder position for archived project list [SCI-8126]	2023-09-27 12:43:58 +02:00
Martin Artnik	3d04ed603f	Merge pull request #6302 from ivanscinote/SCI-9336-no-horizontal-scrollbar-on-protocol-label-templates-when-bottom-action-toolbar-is-displayed ... Fix horizotnal scrollbar position for protocol & label templates [SCI-9336]	2023-09-27 12:43:04 +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
sboursen-scinote	e446522e81	Fix no-result placeholder position for archived project list [SCI-8126]	2023-09-27 10:14:54 +02:00
Ivan Kljun	d53e2e8a5a	Fix horizotnal scrollbar position for protocol & label templates [SCI-9336]	2023-09-27 08:53:02 +02: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
Andrej	701de269f2	Escape inventory column names [SCI-9362]	2023-09-26 14:19:17 +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
Martin Artnik	fba87cfc40	Merge pull request #6274 from G-Chubinidze/gc_SCI_9341 ... Dot divider between steps/results [SCI-9341]	2023-09-25 16:28:41 +02:00
Anton	bb4349f346	Initial label templates refactor [SCI-9303]	2023-09-25 14:24:22 +02:00
Anton	2b676f249b	Css Fixes	2023-09-25 14:15:08 +02:00
Giga Chubinidze	3cee796ac6	added spacings between dots	2023-09-25 14:56:06 +04: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
Anton	6c8447beac	Fix status color	2023-09-22 14:46:10 +02:00
Alex Kriuchykhin	50a87b1562	Merge pull request #6235 from wandji20/wb-SCI-8914 ... Fix issue previweing and realoding assets on hover and after viewmode change [SCI-8914]	2023-09-22 14:14:38 +02:00
Anton	ad3cd98d6e	CSS fixes protocol page	2023-09-22 11:59:39 +02:00
wandji20	3dd7d0fdb3	Fix issue previweing and realoding assets on hover and after viewmode change [SCI-8914]	2023-09-22 09:36:07 +01:00
Giga Chubinidze	add1a55e0d	Dot divider between steps/results	2023-09-22 05:25:33 +04: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
Alex Kriuchykhin	5cc41451cd	Merge pull request #6254 from sboursen-scinote/sb_SCI-9133 ... Fix missing icon files in exported projects [SCI-9133]	2023-09-21 17:12:08 +02:00
sboursen-scinote	aa769f92f7	Fix missing icon files in exported projects [SCI-9133]	2023-09-21 15:11:02 +02:00
aignatov-bio	af7bc2f11b	Merge pull request #6265 from aignatov-bio/ai-add-addons-to-tailwind ... Add addons to tailwind and label fixes	2023-09-21 13:30:37 +02:00
Anton	97999028ef	Fix modals after revamp [SCI-9330]	2023-09-21 12:52:55 +02:00
Anton	3d43c791ad	Fix input fields globaly	2023-09-21 11:38:58 +02:00
aignatov-bio	2ab4d2b8dc	Merge pull request #6263 from aignatov-bio/ai-sci-9319-update-protocol-template-screen ... Update protocol template screen [SCI-9319]	2023-09-21 10:39:16 +02:00
Anton	40144ea33f	Update protocol template screen [SCI-9319]	2023-09-21 10:37:58 +02:00
aignatov-bio	ecd00a4f4f	Merge pull request #6262 from aignatov-bio/ai-sci-9342-fix-task-details-section-css ... Task details css fixes [SCI-9342]	2023-09-21 10:20:00 +02:00
Martin Artnik	2ad0d3a65f	Merge pull request #6260 from G-Chubinidze/gc_SCI_9289 ... Result comments issues [SCI-9289]	2023-09-21 10:01:30 +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
Anton	ce2d91025c	Task details css fixes [SCI-9342]	2023-09-21 09:48:46 +02:00
Giga Chubinidze	eb5d09e2fb	CSS: Results revamp issues	2023-09-21 10:52:41 +04:00
Giga Chubinidze	f0fdfe2ea3	Result comments issues	2023-09-21 06:21:50 +04:00
Anton	4cc968bcb2	Filters modal fixes [SCI-9276]	2023-09-20 11:07:48 +02:00
Alex Kriuchykhin	825f0e839f	Merge pull request #6250 from lasniscinote/gl_SCI_9226 ... Fixed breaking table in shared view [SCI-9226]	2023-09-19 14:33:26 +02:00
Anton	ab8deeb181	Fix legacy inline editing [SCI-9274]	2023-09-19 13:17:23 +02:00
Gregor Lasnibat	ddc17c912f	Fixed breaking table in shared view [SCI-9226]	2023-09-19 12:49:02 +02:00
Alex Kriuchykhin	2303b72f78	Merge pull request #6246 from lasniscinote/gl_SCI_9306 ... Fix ESLint config/install v.01 [SCI-9306]	2023-09-19 10:40:08 +02:00
Gregor Lasnibat	7a6b4ed359	Fix ESLint config/install v.01 [SCI-9306] ... Added yarn.lock [SCI-9306]	2023-09-19 09:27:29 +02:00
Oleksii Kriuchykhin	3b170a0c0d	Connect backend to the new item card [SCI-9313]	2023-09-18 16:42:01 +02:00
aignatov-bio	e34de5511a	Merge pull request #6241 from aignatov-bio/ai-sci-more-css-fixes ... Fix css for protocol/results	2023-09-18 15:39:06 +02:00
Anton	6228a3bc00	Fix css for protocol/results	2023-09-18 15:35:27 +02:00
Martin Artnik	9aa4274702	Merge pull request #6237 from lasniscinote/gl_SCI_9188 ... Fixed misplaced checkbox for archived task [SCI-9188]	2023-09-18 14:42:00 +02:00
ajugo	8c1292c8ab	Merge pull request #6239 from rekonder/aj_SCI_9288 ... Change dropdown options for importing protocols [SCI-9288]	2023-09-18 14:24:10 +02:00
Gregor Lasnibat	6efdc75f45	Fixed misplaced checkbox for archived task [SCI-9188] ... Fixed linter issues [SCI-9188]	2023-09-18 13:41:58 +02:00
Andrej	aebea07be4	Change dropdown options for importing protocols [SCI-9288]	2023-09-18 13:15:55 +02:00
Gregor Lasnibat	90c85290d6	Fixed styles for the clear button on activities [SCI-9192] ... PR fix 01 [SCI-9192]	2023-09-18 13:05:43 +02:00
wandji20	996e3b1d9a	Fix issue loading iframe modal in session_layouts [SCI-9310]	2023-09-18 10:28:19 +01:00
Martin Artnik	1068f9b979	Merge pull request #6232 from ivanscinote/SCI-9235-table-horizontal-scroller-when-bottom-action-toolbar-is-opened ... Make bottom scrollbar visible with action toolbar at inventories [SCI-9235]	2023-09-18 09:32:05 +02:00
Ivan Kljun	13715fa472	Make bottom scrollbar visible with action toolbar at inventories [SCI-9235]	2023-09-15 15:08:09 +02:00
aignatov-bio	5258e55d00	Merge pull request #6230 from aignatov-bio/ai-sci-9265-update-flyouts-menu-task-results ... Replace flyouts menu in protocol in results [SCI-9265]	2023-09-15 14:40:55 +02:00
Oleksii Kriuchykhin	36f4e22fa3	Merge branch 'develop' into features/october-release	2023-09-15 14:08:45 +02:00
Anton	b0dc63ebb5	Replace flyouts menu in protocol in results [SCI-9265]	2023-09-15 12:39:56 +02:00
wandji20	0b0eddd62b	Add default columns to inventory item card [SCI-9151]	2023-09-15 11:39:42 +01:00
Alex Kriuchykhin	7f4b147a1f	Merge pull request #6204 from sboursen-scinote/sb_SCI-8126-fix ... Fix issues with the you've reached the end of the list banner [SCI-8126]	2023-09-15 12:38:15 +02:00