17265 commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ajugo	c02653a45a	Merge pull request #7718 from rekonder/aj_SCI_10894 ... Fix saving of repository state [SCI-10894]	2024-07-16 13:59:24 +02:00
Andrej	56439bf5ec	Fix saving of repository state [SCI-10894]	2024-07-16 13:32:21 +02:00
aignatov-bio	4f6e2adfc1	Merge pull request #7717 from aignatov-bio/ai-sci-10834-fix-scinote-edit-check ... Fix scinote edit check [SCI-10834]	2024-07-16 11:55:12 +02:00
Anton	9604af8e4c	Fix scinote edit check [SCI-10834]	2024-07-16 11:53:32 +02:00
Martin Artnik	9c1140c3b6	Merge pull request #7716 from artoscinote/ma_SCI_10896 ... Also resize TinyMCE images for export reports [SCI-10896]	2024-07-16 10:39:09 +02:00
Martin Artnik	bb6cf73e7b	Also resize TinyMCE images for export reports [SCI-10896]	2024-07-16 10:33:27 +02:00
aignatov-bio	ef9fc0b020	Merge pull request #7715 from aignatov-bio/ai-sci-10887-protocol-info-on-task-page ... Fix overflow issue for protocol info [SCI-10887]	2024-07-15 15:42:00 +02:00
aignatov-bio	81fdc4363c	Merge pull request #7714 from aignatov-bio/ai-sci-10841-add-html-support-for-left-menu ... Add html support for left menu [SCI-10841]	2024-07-15 15:38:57 +02:00
Anton	7d6c75b622	Fix overflow issue for protocol info [SCI-10887]	2024-07-15 15:04:54 +02:00
aignatov-bio	8587bcad68	Merge pull request #7670 from aignatov-bio/ai-sci-10818-poc-instruction-in-inventory-export ... Instruction for inventory import [SCI-10846]	2024-07-15 14:44:29 +02:00
Martin Artnik	83394b7e9e	Merge pull request #7713 from artoscinote/ma_SCI_10889 ... Fix handling of blank rows and stock changes [SCI-10889]	2024-07-15 14:41:10 +02:00
Anton	2e413b28af	Add html support for left menu [SCI-10841]	2024-07-15 14:40:13 +02:00
Martin Artnik	fb38cd2e72	Fix previewer initialization	2024-07-15 14:24:19 +02:00
Martin Artnik	c811d191eb	Fix handling of blank rows and stock changes [SCI-10889]	2024-07-15 14:20:02 +02:00
ajugo	668e3b0851	Merge pull request #7712 from rekonder/aj_SCI_10891 ... Fix import for do not import option [SCI-10891]	2024-07-15 13:35:59 +02:00
Andrej	24e1baefd6	Fix import for do not import option [SCI-10891]	2024-07-15 12:58:55 +02:00
Martin Artnik	5b69e5277c	Merge pull request #7709 from artoscinote/ma_SCI_10885 ... Remove overflow-auto that breaks submenus [SCI-10885]	2024-07-15 10:55:02 +02:00
aignatov-bio	694432ffa9	Merge pull request #7707 from aignatov-bio/ai-sci-10855-add-negative-numbers-to-stock ... Add negative stock values to import [SCI-10855]	2024-07-15 10:30:13 +02:00
Martin Artnik	2d9c26ceb5	Merge pull request #7711 from rekonder/aj_SCI_10854 ... Fix checklist importing [SCI-10854]	2024-07-15 09:59:35 +02:00
Andrej	d72862e25e	Fix checklist importing [SCI-10854]	2024-07-15 09:56:18 +02:00
Martin Artnik	856bd4a57a	Remove overflow-auto that breaks submenus [SCI-10885]	2024-07-12 14:21:40 +02:00
aignatov-bio	d8a270d8f7	Merge branch 'develop' into ai-sci-10818-poc-instruction-in-inventory-export	2024-07-12 13:27:47 +02:00
Anton	c17c15f3ad	POC for instruction of inventory export [SCI-8865]	2024-07-12 13:27:05 +02:00
aignatov-bio	3925a3a169	Merge pull request #7706 from aignatov-bio/ai-sci-10824-fix-users-filter-long-username ... Fix users long username [SCI-10824]	2024-07-12 13:24:05 +02:00
Anton	9c5b564bd0	Add negative stock values to import [SCI-10855]	2024-07-12 13:23:40 +02:00
Martin Artnik	ba2ede1044	Merge pull request #7705 from artoscinote/ma_SCI_10878 ... Fix duplicate import items check [SCI-10878]	2024-07-12 13:00:29 +02:00
Anton	3245e444c6	Fix users long username [SCI-10824]	2024-07-12 12:54:51 +02:00
aignatov-bio	7b1b71cfff	Merge pull request #7704 from aignatov-bio/ai-sci-10812-fix-import-css-issues ... Small fixes for import [SCI-10812]	2024-07-12 12:46:51 +02:00
Martin Artnik	ec9bdbfd27	Fix duplicate import items check [SCI-10878]	2024-07-12 12:30:26 +02:00
Martin Artnik	14c9bf5799	Merge pull request #7703 from artoscinote/ma_SCI_10877 ... Clear import modal state on modal open [SCI-10877]	2024-07-12 10:57:39 +02:00
aignatov-bio	b5d0837b93	Merge pull request #7681 from aignatov-bio/ai-sci-10785-add-toolbar-for-steps ... Add toolbar for steps and results [SCI-10785]	2024-07-12 10:56:40 +02:00
Anton	981c5e4b25	Small fixes for import [SCI-10812]	2024-07-12 10:55:47 +02:00
ajugo	c92fbe52e2	Merge pull request #7702 from rekonder/aj_SCI_10884 ... Fix handling of custom repository text on import for too many characters [SCI-10884]	2024-07-12 10:49:54 +02:00
Martin Artnik	3c6798a2c2	Clear import modal state on modal open [SCI-10877]	2024-07-12 10:27:35 +02:00
Andrej	e46774cc3d	Fix handling of custom repository text on import for too many characters [SCI-10884]	2024-07-11 16:19:19 +02:00
ajugo	544da61038	Merge pull request #7701 from rekonder/aj_SCI_10883 ... Fix tests [SCI-10883]	2024-07-11 16:17:22 +02:00
Andrej	47bec33647	Fix tests [SCI-10883]	2024-07-11 16:00:22 +02:00
Martin Artnik	fd95e485c5	Bump version to 1.35.0.3	2024-07-11 15:47:53 +02:00
Martin Artnik	6073860705	Merge pull request #7700 from artoscinote/ma_SCI_10879 ... Implement soft-locked repositories [SCI-10880]	2024-07-11 15:47:18 +02:00
Martin Artnik	096d1fca92	Implement soft locked repository [SCI-10880]	2024-07-11 15:41:13 +02:00
Martin Artnik	34e9c9f4e8	Merge pull request #7696 from artoscinote/ma_SCI_10853 ... Change import activites and flash messages [SCI-10853]	2024-07-11 15:04:55 +02:00
aignatov-bio	bb62ea3261	Merge pull request #7699 from aignatov-bio/ai-sci-10872-fix-mapping-behavior ... Fix mapping behavior [SCI-10872]	2024-07-11 15:01:28 +02:00
Anton	87a1a5a3e6	Fix mapping behavior [SCI-10872]	2024-07-11 15:00:07 +02:00
Martin Artnik	6ebc08a0f4	Fix count condition for generating activity [SCI-10853]	2024-07-11 14:57:49 +02:00
Andrej	aa0c5dd6fa	Update logic for saving update at and modified by on repository row [SCI-10746]	2024-07-11 12:37:14 +02:00
ajugo	99915cb43f	Merge pull request #7698 from rekonder/aj_SCI_10874 ... Fix importing items when input format is incorrect [SCI-10874]	2024-07-11 11:49:13 +02:00
ajugo	01175a997d	Merge pull request #7697 from rekonder/aj_SCI_10751 ... Remove updated on and updated by from default filters [SCI-10751]	2024-07-11 11:48:59 +02:00
Andrej	181b55b1a1	Fix importing items when input format is incorrect [SCI-10874]	2024-07-11 11:43:37 +02:00
Andrej	96dc475f0f	Remove updated on and updated by from default filters [SCI-10751]	2024-07-10 15:55:50 +02:00
Martin Artnik	8c6b36a4c1	Remove unsupported rubocop cop	2024-07-10 15:50:39 +02:00