11718 commits

Author	SHA1	Message	Date
Martin Artnik	5265312125	Merge pull request #6365 from G-Chubinidze/gc_SCI_9398 ... Misalignments on the log in page when 2FA is enforced [SCI-9398]	2023-10-06 09:40:43 +02:00
Giga Chubinidze	4399b6cc0a	Misalignments on the log in page when 2FA is enforced [SCI-9398]	2023-10-06 10:32:47 +04: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	587e07a9f1	Merge pull request #6350 from lasniscinote/gl_SCI_9419 ... Fixed a list-item bug where view_mode was active [SCI-9419]	2023-10-05 15:31:17 +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
Alex Kriuchykhin	407acb14c0	Merge pull request #6331 from wandji20/wb-SCI-9420 ... Fix issue with protocol and result text name [SCI-9420]	2023-10-05 15:27:04 +02:00
wandji20	36ff372b30	Small improvement [SCI-9420]	2023-10-05 14:23:10 +01:00
wandji20	d3c2a7e0ad	Fix issue with timestamps for reports [SCI-9420]	2023-10-05 12:25:08 +01: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
Martin Artnik	eee6da4abd	Merge pull request #6322 from G-Chubinidze/gc_SCI_9401 ... CSS: Blank name error message on table [sci-9401]	2023-10-05 11:04:20 +02:00
Giga Chubinidze	2c3d5c4fd5	changed styling to tw class / optimized inline editing height	2023-10-05 13:01:34 +04:00
Alex Kriuchykhin	0ebcb58fa6	Merge pull request #6336 from lasniscinote/gl_SCI_9354 ... Fixed breaking QR code generation [SCI-9354]	2023-10-05 10:12:14 +02:00
wandji20	6358ad2da4	Fix issue with protocol and result text name [SCI-9420]	2023-10-05 08:08:49 +01:00
Martin Artnik	1c84a97bd7	Merge pull request #6360 from G-Chubinidze/gc_SCI_9405 ... Projects table header covered by top toolbar on some breakpoint [SCI-9405]	2023-10-05 09:06:12 +02:00
Giga Chubinidze	3dbdbf02f8	Projects table header covered by top toolbar on some breakpoint [SCI-9405]	2023-10-05 02:44:30 +04:00
Martin Artnik	ae77613d94	Merge pull request #6357 from rekonder/aj_SCI_9445 ... Fix icons and OVE view for attachments [SCI-9445]	2023-10-04 17:19:26 +02:00
Andrej	0a53b2e6bc	Fix opening protocol parser import modal [SCI-9452]	2023-10-04 17:13:27 +02:00
Alex Kriuchykhin	afb40fd762	Merge pull request #6337 from rekonder/aj_SCI_9427 ... Fix consumption export date format [SCI-9427]	2023-10-04 16:54:08 +02:00
Andrej	301ba6b818	Fix consumption export date format [SCI-9427]	2023-10-04 16:46:19 +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
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
Martin Artnik	840ca9b73a	Merge pull request #6351 from artoscinote/ma_SCI_9408 ... Fix unwanted checklist name locking [SCI-9408]	2023-10-04 15:43:22 +02:00
Martin Artnik	bcf7039fee	Merge pull request #6355 from artoscinote/ma_SCI_9428 ... Fix z-index of task tab toolbar [SCI-9428]	2023-10-04 15:43:02 +02:00
Martin Artnik	b545b6fdf9	Fix z-index of task tab toolbar [SCI-9428]	2023-10-04 14:22:17 +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
Martin Artnik	ab1eae1bd2	Merge pull request #6353 from ivanscinote/SCI-9430-move-result-does-not-work ... Set sequential_updates to true for acts_as_list for result orderable [SCI-9430]	2023-10-04 14:01:45 +02:00
Ivan Kljun	b4faefdb23	Set sequential_updates to true for acts_as_list for result orderable [SCI-9430]	2023-10-04 13:59:23 +02:00
Martin Artnik	b3c2dd75cf	Merge pull request #6349 from ivanscinote/SCI-9430-move-result-does-not-work ... Fix moving result elements bug [SCI-9430]	2023-10-04 13:54:30 +02:00
Ivan Kljun	2919516bca	Fix moving result elements bug [SCI-9430]	2023-10-04 13:37:00 +02:00
Oleksii Kriuchykhin	421ba27a6f	Merge branch 'release/1.28.0' into develop	2023-10-04 13:19:31 +02:00
Martin Artnik	6b8382c564	Fix unwanted checklist name locking [SCI-9408]	2023-10-04 13:15:41 +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
Martin Artnik	f3900baadc	Merge pull request #6347 from artoscinote/ma_SCI_9339 ... Shared task designated users style fix [SCI-9339]	2023-10-04 12:50:23 +02:00
Martin Artnik	93bbd32cb8	Merge pull request #6343 from artoscinote/ma_SCI_9428 ... Fix dropdown issues [SCI-9428]	2023-10-04 12:49:56 +02:00
Giga Chubinidze	5544b0e50e	uniquefied gallery param from js	2023-10-04 14:49:32 +04:00
Martin Artnik	4ea040cde7	Fix z-index issue with stackable headers [SCI-9428]	2023-10-04 12:48:31 +02:00
Gregor Lasnibat	56d393d16a	Fixed a list-item bug where view_mode was active [SCI-9419]	2023-10-04 11:30:34 +02: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	03b12e0a22	Shared task designated users style fix [SCI-9339]	2023-10-04 09:56:09 +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
Andrej	9b1d9823c1	Add missing wording for failed export email/notifications [SCI-9442]	2023-10-04 09:02:35 +02:00
Giga Chubinidze	b4247391a5	CSS: Incorrect icons on large PDF previews & caret on task activity [SCI-9438]	2023-10-04 05:36:03 +04: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
Martin Artnik	5960446401	Merge pull request #6320 from wandji20/wb-SCI-9406 ... Add helper method to show grey layout background [SCI-9406]	2023-10-03 16:43:18 +02:00
Martin Artnik	14a693b697	Highlight selected sort in results sort dropdown [SCI-9428]	2023-10-03 16:19:27 +02:00
Martin Artnik	1acf67db5a	Fix dropdown opening direction [SCI-9428]	2023-10-03 16:07:05 +02:00
Alex Kriuchykhin	112e642a21	Merge pull request #6340 from lasniscinote/gl_SCI_9419 ... Fixed Protocol templates missing additional options for steps [SCI-9419]	2023-10-03 15:29:10 +02:00
Martin Artnik	2d9c6ae249	Merge pull request #6339 from artoscinote/ma_SCI_9339 ... Fix broken shared task styling [SCI-9339]	2023-10-03 15:12:48 +02:00
Gregor Lasnibat	87714b4dd9	Fixed breaking QR code generation [SCI-9354]	2023-10-03 15:11:40 +02:00
Gregor Lasnibat	6724a31256	Fixed Protocol templates missing additional options for steps [SCI-9419]	2023-10-03 15:03:37 +02:00
sboursen-scinote	1aaea77070	Add dynamic card placeholder calculation to prevent scrollbars [SCI-9068]	2023-10-03 15:00:26 +02:00
Martin Artnik	c9e3055a22	Fix broken shared task styling [SCI-9339]	2023-10-03 14:26:06 +02:00
wandji20	b5acdd2bf6	Refactor application helper method [SCI-9406]	2023-10-03 13:24:39 +01:00
sboursen-scinote	d3fbfc3618	Fix no-result placeholder position for archived project list [SCI-8126]	2023-10-03 14:04:09 +02:00
wandji20	dd34e72fb9	Add helper method to show grey layout background [SCI-9406]	2023-10-03 12:48:31 +01:00
Alex Kriuchykhin	f3f4fc1ad0	Merge pull request #6333 from okriuchykhin/ok_SCI_9368 ... Use custom sanitizer config for PDF reports generation [SCI-9368]	2023-10-03 13:09:50 +02:00
Alex Kriuchykhin	9966229324	Merge pull request #6308 from wandji20/wb-SCI-9165 ... Fix counter issue in repository export modal [SCI-9165]	2023-10-03 12:53:06 +02:00
Alex Kriuchykhin	a000f0e67e	Merge pull request #6303 from wandji20/wb-SCI-9157 ... Add export button to item card [SCI-9157]	2023-10-03 12:52:03 +02:00
Alex Kriuchykhin	8cc72cb05e	Merge pull request #6334 from wandji20/wb-SCI-9359 ... Update OVE package and fix bug opening github issue link [SCI-9359]	2023-10-03 12:51:15 +02:00
Martin Artnik	37c71d8567	Merge pull request #6321 from ivanscinote/SCI-9403-user-is-able-to-move-content-to-archived-results ... Fix move_targets methods to only return active results; prevent moving elements to archived results [SCI-9403]	2023-10-03 12:45:42 +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
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	a85b2643ce	Merge pull request #6319 from artoscinote/ma_SCI_9425 ... Implement default name for results [SCI-9425]	2023-10-03 10:56:03 +02:00
wandji20	4f5ecf66f4	Update OVE package and fix bug opening github issue link [SCI-9359]	2023-10-03 09:54:54 +01:00
Martin Artnik	b4ce0dda60	Merge pull request #6316 from artoscinote/ma_SCI_9400 ... Add back version modal link [SCI-9400]	2023-10-03 10:54:47 +02:00
wandji20	5f5a170827	Fix counter issue in repository export modal [SCI-9165]	2023-10-03 09:49:57 +01: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
Giga Chubinidze	de2023c873	removed unnecessary tw classes	2023-10-03 12:38:40 +04: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
Alex Kriuchykhin	42b145648f	Merge pull request #6276 from wandji20/wb-SCI-9359 ... Update OVE package and fix bug opening github issue link [SCI-9359]	2023-10-03 10:18:11 +02:00
Oleksii Kriuchykhin	d9404df361	Use custom sanitizer config for PDF reports generation [SCI-9368]	2023-10-03 09:39:47 +02:00
Andrej	835cfb5e07	Refactor export stock consumption modal [SCI-9386]	2023-10-03 09:27:10 +02:00
Andrej	1aa9091e0d	Fix protocol parser import button closing [SCI-9275]	2023-10-03 09:13:20 +02:00
Giga Chubinidze	f99db28760	using tailwind	2023-10-03 11:04:38 +04:00
wandji20	7b9e4088de	Update OVE package and fix bug opening github issue link [SCI-9359]	2023-10-02 23:33:46 +01:00
Gregor Lasnibat	a5ad6d375e	Fixed repositoryItemSidebar wrapper covering up content when closed [SCI-9354]	2023-10-02 17:00:47 +02:00
Martin Artnik	f620a99577	Fix checking asset blob permissions [SCI-9353]	2023-10-02 16:18:29 +02:00
Martin Artnik	a2870dd9d1	Add back version modal link [SCI-9400]	2023-10-02 14:31:28 +02:00
Alex Kriuchykhin	20be895938	Merge pull request #6325 from rekonder/aj_SCI_9275 ... Fix closing of the dropdown menu for protocol parser import [SCI-9275]	2023-10-02 13:58:50 +02:00
Alex Kriuchykhin	c4f646ef78	Merge pull request #6324 from rekonder/aj_SCI_9409 ... Fix marvinjs loading and speedup creating of the wopi files [SCI-9409]	2023-10-02 13:58:30 +02:00
G-Chubinidze	fbdd5a8165	Revert "Organization settings (org. admin) - allowing the use of protocols for AI [SCI-9324]"	2023-10-02 12:28:29 +04:00
Andrej	4cf6d225ca	Fix closing of the dropdown menu for protocol parser improt [SCI-9275]	2023-10-02 08:57:26 +02:00
Andrej	e1ca9175b7	Fix marvinjs loading and speedup creating of the wopi files [SCI-9409]	2023-10-02 08:32:50 +02:00
Giga Chubinidze	3932b22cd4	Smart annotation modal: inventory name not correct [SCI-9332]	2023-10-02 08:14:16 +04:00
Giga Chubinidze	b2bc968a4f	CSS: Blank name error message on table [sci-9401]	2023-10-02 07:41:31 +04:00
Ivan Kljun	b0511ecec5	Fix move_targets methods to only return active results; prevent moving elements to archived results [SCI-9403]	2023-09-29 14:43:12 +02: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
Martin Artnik	80c23bd0fc	Merge pull request #6318 from artoscinote/ma_SCI_9328 ... Fix linked protocol info button position [SCI-9328]	2023-09-29 12:11:39 +02:00
Martin Artnik	0cb3c8bc62	Merge pull request #6313 from G-Chubinidze/gc_SCI_9324 ... Organization settings (org. admin) - allowing the use of protocols for AI [SCI-9324]	2023-09-29 11:49:26 +02:00
Martin Artnik	4f2f5d156b	Fix linked protocol info button position [SCI-9328]	2023-09-29 11:45:04 +02:00
Giga Chubinidze	005bf93197	Organization settings (org. admin) - allowing the use of protocols for AI [SCI-9324]	2023-09-29 11:51:25 +04:00
Giga Chubinidze	07ce65f5e6	DOCX not working if result name empty.	2023-09-29 10:38:27 +04:00
Martin Artnik	7319ac5b50	Merge pull request #6310 from artoscinote/ma_SCI_9328 ... Fix linked protocol dropdown [SCI-9328]	2023-09-28 15:46:37 +02:00
Martin Artnik	82b9b676b6	Fix linked protocol dropdown [SCI-9328]	2023-09-28 15:40:48 +02: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
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	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
Alex Kriuchykhin	8c1b09791d	Merge pull request #6306 from artoscinote/ma_SCI_9353 ... Fix for downloading assets not in current user team [SCI-9353]	2023-09-27 14:53:20 +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	2edba4e188	Fix for downloading assets not in current user team [SCI-9353]	2023-09-27 14:13:34 +02:00
Martin Artnik	3ce0779663	Merge pull request #6290 from ivanscinote/SCI-9344-sticky-toolbar-issues ... Fix results sticky toolbar [SCI-9344]	2023-09-27 14:03:12 +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	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
Giga Chubinidze	b53ac04577	styling fix	2023-09-27 14:47:35 +04:00
Martin Artnik	c6272afe27	Merge pull request #6264 from ivanscinote/SCI-9247-ensure-team-export-works-with-new-results ... Ensure team export works with new results [SCI-9247]	2023-09-27 12:46:52 +02:00
Martin Artnik	a8bdbc5faa	Merge pull request #6305 from ivanscinote/SCI-9349-a-new-office-file-added-to-existing-result-will-be-created-in-a-new-result ... Fix bug for adding Office files to a result [SCI-9349]	2023-09-27 12:45:36 +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
Martin Artnik	9b2e5b6455	Merge pull request #6289 from G-Chubinidze/gc_SCI_9289 ... Removed delete/edit comment access on archived results [SCI-9289]	2023-09-27 12:41:03 +02:00
Andrej	5e5010632d	Fix naming in assigned my module helper [SCI-9155]	2023-09-27 11:44:08 +02:00
Ivan Kljun	0b069430db	Fix bug for adding Office files to a result [SCI-9349]	2023-09-27 10:55:03 +02:00
Martin Artnik	187c8b12f9	Merge pull request #6296 from ivanscinote/SCI-9346-cannot-insert-a-chemical-drawing-into-results ... Add hidden element to support legacy code for MarvinJS at results [SCI-9346]	2023-09-27 10:43:25 +02:00
sboursen-scinote	e446522e81	Fix no-result placeholder position for archived project list [SCI-8126]	2023-09-27 10:14:54 +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
Ivan Kljun	d53e2e8a5a	Fix horizotnal scrollbar position for protocol & label templates [SCI-9336]	2023-09-27 08:53:02 +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
Alex Kriuchykhin	8cf26d7a90	Merge pull request #6283 from rekonder/aj_SCI_9162 ... Fix css for importing inventory [SCI-9162]	2023-09-26 15:07:15 +02:00
Andrej	701de269f2	Escape inventory column names [SCI-9362]	2023-09-26 14:19:17 +02:00
Oleksii Kriuchykhin	efae35816f	Fix column placement in stock consumption export, add missing localization [SCI-9282]	2023-09-26 13:35:02 +02:00
Ivan Kljun	1373994559	Fix results sticky toolbar [SCI-9344]	2023-09-26 12:20:49 +02:00
Andrej	9641c75a4a	Merge branch 'develop' of https://github.com/scinote-eln/scinote-web into aj_SCI_9275	2023-09-26 11:23:25 +02:00
Oleksii Kriuchykhin	d69b7cc6e8	Merge branch 'develop' into features/october-release	2023-09-26 11:11:30 +02:00
Ivan Kljun	f16354e498	Add hidden element to support legacy code for MarvinJS at results [SCI-9346]	2023-09-26 10:09:45 +02:00
Martin Artnik	a1cbfa9736	Merge pull request #6295 from ivanscinote/SCI-9333-import-dropdown-always-open-on-protocol-templates ... Fix dropdown always open on protocol templates [SCI-9333]	2023-09-26 10:06:55 +02:00
Ivan Kljun	0794b4bdc7	Fix dropdown always open on protocol templates [SCI-9333]	2023-09-26 09:11:54 +02:00
Alex Kriuchykhin	2771c04257	Merge pull request #6288 from rekonder/aj_SCI_9367 ... Fix comment permission check [SCI-9367]	2023-09-25 17:14:29 +02:00
Martin Artnik	80afa31632	Merge pull request #6293 from aignatov-bio/ai-sci-9375-add-selected-state-for-dropdown ... Add assets_view_mode for result [SCI-9375]	2023-09-25 16:44:18 +02:00
Anton	254b55772d	Add assets_view_mode for result [SCI-9375]	2023-09-25 16:43:14 +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	2b9ae65a51	Fix selected state for dropdown [SCI-9385][SCI-9276][SCI-9375][SCI-9379]	2023-09-25 15:04:41 +02:00
Anton	2b676f249b	Css Fixes	2023-09-25 14:15:08 +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
Giga Chubinidze	4d3c0dd919	Removed delete/edit comment access on archived results [SCI-9289]	2023-09-25 15:33:36 +04:00
Giga Chubinidze	3cee796ac6	added spacings between dots	2023-09-25 14:56:06 +04: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
Andrej	e0355bd75a	Fix generation of labels [SCI-9155]	2023-09-25 11:47:30 +02:00
Andrej	ce1fe53ceb	Fix comment permission check [SCI-9367]	2023-09-25 11:14:22 +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
aignatov-bio	647d94bebc	Merge pull request #6279 from aignatov-bio/ai-sci-9343-improve-flyouts ... Fixes for new flyout [SCI-9343]	2023-09-25 10:15:11 +02:00
wandji	7430f2240d	Add navigation section to item card [SCI-9154] (#6268)	2023-09-25 09:53:12 +02:00
Andrej	65affdf639	Fix css for importing inventory [SCI-9162]	2023-09-25 09:06:13 +02:00
Martin Artnik	3f23d10462	Merge pull request #6281 from G-Chubinidze/gc_SCI_9326 ... Thumbnail previews on attachments that cannot generate a preview. [SCI-9326]	2023-09-25 09:05:38 +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
Andrej	2478918aa6	Fix protocol parser flyout and notifications [SCI-9275]	2023-09-25 07:55:43 +02:00
Giga Chubinidze	5bae359b91	Thumbnail previews on attachments that cannot generate a preview.	2023-09-25 06:30:34 +04: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
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
Alex Kriuchykhin	c817c269cb	Merge pull request #6270 from lasniscinote/gl_SCI_9153 ... Refactoring RepositoryItemSidebar and custom columns [SCI-9153]	2023-09-22 14:13:54 +02:00
aignatov-bio	a19a2d16e9	Merge pull request #6272 from aignatov-bio/ai-sci-9340-update-checklists-interactions ... Refactor checklist [SCI-9340]	2023-09-22 12:09:41 +02:00
Anton	01e4ab3cd5	Removed variable	2023-09-22 12:07:56 +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
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
Anton	566705cb67	Small fixes [SCI-9340]	2023-09-22 10:07:29 +02:00
Anton	77948572f1	Refactor checklist [SCI-9340]	2023-09-22 08:36:37 +02: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
Ivan Kljun	84d3c8a279	Fix team import/export to work with new result [SCI-9247]	2023-09-21 14:23:33 +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
sboursen-scinote	90b9813083	Remove the Experiment ID displayed in the three dots menu dropdown [SCI-9215]	2023-09-21 11:38:09 +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
Alex Kriuchykhin	04e191e377	Merge pull request #6259 from wandji20/wb-SCI-9191 ... Fix issue displaying long tables protocol description in import modal [SCI-9191]	2023-09-21 09:26:25 +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
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
wandji20	ca8e6d88dc	Fix issue displaying long tables protocol description in impor modal [SCI-9191]	2023-09-20 15:04:10 +01:00
Martin Artnik	5983ecb2bd	Merge pull request #6255 from artoscinote/ma_SCI_9348 ... Clean up legacy comment logic [SCI-9348]	2023-09-20 13:10:28 +02:00
aignatov-bio	1233c34fb2	Merge pull request #6257 from aignatov-bio/ai-sci-9305-fix-task-secondary-navigation-on-small-screens ... Fix task secondary navigation on small screens [SCI-9305]	2023-09-20 13:10:22 +02:00
Martin Artnik	44394fa1b6	Clean up legacy comment logic [SCI-9348]	2023-09-20 13:07:30 +02:00
Anton	d46ee2adf6	Fix task secondary navigation on small screens [SCI-9305]	2023-09-20 12:30:15 +02:00
Anton	4cc968bcb2	Filters modal fixes [SCI-9276]	2023-09-20 11:07:48 +02:00