678 commits

Author	SHA1	Message	Date
Anton	7961bee35f	Merge branch 'develop' into features/september-release	2023-08-07 14:11:29 +02:00
Anton	89c526103d	Merge branch 'develop' into features/remove-front-end-gems	2023-08-07 11:23:21 +02:00
Anton	937bc60542	Merge branch 'features/september-release' of github.com:scinote-eln/scinote-web into features/september-release	2023-08-07 10:37:20 +02:00
sboursen-scinote	c27c7245bc	Fix various CSS issues [SCI-8940] ... - Maintain the position of the top navigation controls when user is without team. - Add "missing" avatar to avatar change modal - Disable wrapping of (A) in archived P/E/T - Fix padding/margin issues in Archived tasks and Protocol templates	2023-08-04 09:11:53 +02:00
Oleksii Kriuchykhin	b49b7c4a80	Merge branch 'develop' into features/shareable-links	2023-08-02 16:05:21 +02:00
Giga Chubinidze	4cd1f59d7b	CSS - mixed issues [SCI-8849]	2023-07-31 08:47:43 +04:00
Martin Artnik	3c58b8473d	Fix icon in stock consume modal [SCI-8915]	2023-07-25 09:56:55 +02:00
Oleksii Kriuchykhin	de69b1b100	Merge branch 'develop' into features/shareable-links	2023-07-25 09:47:47 +02:00
Martin Artnik	91153b156a	Fix incorrect icons [SCI-8915]	2023-07-24 14:18:24 +02:00
Andrej	3ed91daf4f	Fix opening tabs on tasks for archived tasks [SCI-8887]	2023-07-19 13:47:03 +02:00
Andrej	f493ec0da1	Merge branch 'develop' into features/shareable-links	2023-07-19 12:57:20 +02:00
ajugo	c1db4529e9	Fix consume modal display on full table view on task [SCI-8868] (#5798)	2023-07-19 10:32:36 +02:00
ajugo	f84de45cfe	Fix opening of activites for archived my_module [SCI-8887] (#5804)	2023-07-19 09:42:23 +02:00
Anton	1087f67228	Merge branch 'develop' into features/remove-front-end-gems	2023-07-18 14:36:40 +02:00
ajugo	2f5015e2a2	Fix error at adding consumption to assigned item to task [SCI-8868] (#5789)	2023-07-17 15:42:40 +02:00
Oleksii Kriuchykhin	a95aab85e2	Merge branch 'develop' into features/shareable-links	2023-07-13 15:04:27 +02:00
Oleksii Kriuchykhin	fca9aea4a8	Merge branch 'features/rails-upgrade' into develop	2023-07-13 13:10:59 +02:00
Soufiane	78d8a54e0d	Remove BMT and bioeddie from Scinote [SCI-8643] (#5760)	2023-07-13 09:45:53 +02:00
Anton	8e1836aa82	CSS fixes [SCI-8762]	2023-07-10 21:09:29 +02:00
ajugo	6c6fc404d2	Implement task shareable modal [SCI-8651] (#5723) ... * Implement task shareable modal [SCI-8651] * Fix routes [SCI-8651] * Clean code for vue share button initilization [SCI-8651]	2023-07-06 16:05:03 +02:00
Soufiane	33bb79d17a	Implement details and notes sections of shareable links [SCI-8750] (#5710) ... Co-authored-by: Sboursen <dev.sboursen@gmail.com>	2023-07-06 15:10:26 +02:00
ajugo	836d1b6be1	Add permissions for shareable links and some fixes for controller [SCI-8747] (#5709) ... Add permissions for shareable links and som fixes for controller [SCI-8747]	2023-07-05 16:21:26 +02:00
artoscinote	85ad167998	Merge pull request #5660 from artoscinote/ma_SCI_8506 ... Make label print modal work globally [SCI-8506]	2023-07-05 09:53:56 +02:00
Anton	b956f9de25	Remove bootstrap form	2023-07-03 12:59:13 +02:00
Soufiane	9d70d35491	Implement share button on task [SCI-8650] (#5691) ... Co-authored-by: Sboursen <dev.sboursen@gmail.com>	2023-06-29 13:38:59 +02:00
Soufiane	1a9ef4a1d5	Update the Tasks screens for the Shareable-links feature [SCI-8649] (#5679) ... Co-authored-by: Sboursen <dev.sboursen@gmail.com>	2023-06-29 11:17:41 +02:00
sboursen-scinote	706c2e492b	Fix CSS and icon inconsistencies [SCI-8164][SCI-8726] ... - Use the correct arrow-left/arrow-right icons. - Show the tasks of active experiments in archived branch in the Navigator. - Fix minor style issues in P/E/T. Co-authored-by: Sboursen <dev.sboursen@gmail.com>	2023-06-26 15:22:36 +02:00
Martin Artnik	9364d139e0	Make label print modal work globally [SCI-8506]	2023-06-22 14:52:47 +02:00
Anton	8fac4c1b7c	UI CSS fixes	2023-06-22 11:55:23 +02:00
Oleksii Kriuchykhin	66b361c689	Upgrade Rails to version 7.0.5 [SCI-8632]	2023-06-21 14:38:32 +02:00
Anton	73880619d6	UI css fixes [SCI-8662]	2023-06-20 13:41:42 +02:00
Anton	4e972de096	UI CSS fixes	2023-06-19 15:58:17 +02:00
artoscinote	62daa073ae	Merge pull request #5611 from G-Chubinidze/gc_SCI_8526 ... Double scroller on assign item to task from inventory table [SCI-8526]	2023-06-19 12:36:54 +02:00
artoscinote	36ae7e6ebd	Merge pull request #5621 from G-Chubinidze/gc_SCI_8673 ... Search field on assign/assigned item to task [SCI-8673]	2023-06-19 10:44:52 +02:00
Giga Chubinidze	44a5a1f3b2	Search field on assign/assigned item to task [SCI-8673]	2023-06-19 10:21:04 +04:00
artoscinote	91ee51105c	Merge pull request #5574 from G-Chubinidze/gc_SCI-8218 ... "i" flyout for protocol on task screen - linked archived protocol template with (A) label [SCI-8218]	2023-06-16 11:34:59 +02:00
Alex Kriuchykhin	2df9367b01	Remove old JS code, unneeded JS include nonce [SCI-8670] (#5607)	2023-06-16 10:19:54 +02:00
artoscinote	c35d3213da	Merge branch 'develop' into gc_SCI_8406	2023-06-16 09:49:19 +02:00
Giga Chubinidze	f8f03e6b51	Double scroller on assign item to task from inventory table [SCI-8526]	2023-06-16 06:50:38 +04:00
Giga Chubinidze	3c2b96a795	(A) label (instead of icons) in front of titles of archived elements [SCI-8406]	2023-06-16 06:05:15 +04:00
Anton	c4f82cc756	Css fixes [SCI-8671]	2023-06-15 15:12:51 +02:00
artoscinote	e57da37ec7	Merge pull request #5573 from G-Chubinidze/gc_SCI_8366 ... New icons implementation [SCI-8366]	2023-06-12 11:25:36 +02:00
Martin Artnik	27c2850f49	More fixes for icons [SCI-8366]	2023-06-08 18:12:28 +02:00
Martin Artnik	dcc30822f5	New icon tweaks & fixes [SCI-8366]	2023-06-08 17:33:50 +02:00
Giga Chubinidze	95437c69a4	included name	2023-06-08 12:54:01 +04:00
Giga Chubinidze	aa5caf3cc3	refactor	2023-06-08 11:54:59 +04:00
Giga Chubinidze	ecf38de4d3	lone operator	2023-06-08 11:08:44 +04:00
Giga Chubinidze	06e31679fe	"i" flyout for protocol on task screen - linked archived protocol template with (A) label [SCI-8218]	2023-06-08 11:07:01 +04:00
Giga Chubinidze	a777fd5584	New icons implementation [SCI-8366]	2023-06-08 10:33:37 +04:00
Anton	0924ae1046	Fix results css [SCI-8618]	2023-06-06 12:36:57 +02:00
ajugo	f38577eb79	Add missing archived icon to the PET [SCI-8563] (#5541)	2023-06-02 10:34:11 +02:00
artoscinote	98a27b083a	Merge pull request #5344 from sboursen-scinote/sb_SCI-8347 ... FIle/step dropdown is out of task border [SCI-8347]	2023-05-30 13:46:10 +02:00
Giga Chubinidze	5e11e3a874	fixed mymodule breadcrumb	2023-05-26 03:45:16 +04:00
Anton	007eae16cc	Multiple small css fixes [SCI-8518]]SCI-8529]	2023-05-24 12:03:47 +02:00
Soufiane	c7fcd0a52f	Activate assign items button in Results page [SCI-8419] (#5469) ... Co-authored-by: Sboursen <dev.sboursen@gmail.com>	2023-05-24 10:35:58 +02:00
sboursen-scinote	1f83679e5e	Merge branch 'develop' into sb_SCI-8347 ... Co-authored-by: Sboursen <dev.sboursen@gmail.com>	2023-05-23 23:08:20 +02:00
Anton	753372f9e4	Fix navigator button style [SCI-8477]	2023-05-18 13:43:26 +02:00
Anton	a33b1b0da7	Update scinote icon font	2023-05-17 12:00:59 +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	8be2a02d9b	Fix my module layout	2023-05-15 15:38:44 +02:00
Anton	e2a14c1853	Refactor Module page layout [SCI-8421]	2023-05-15 14:17:41 +02:00
Anton	1bc2baf1f3	Add navigator interactions [SCI-8047]	2023-04-26 10:34:02 +02:00
sboursen-scinote	a1ff64e3f2	Fix missing translation in my_module archived results [SCI-8347]	2023-04-24 16:42:49 +02:00
Anton	e8b952f4fd	Revert "Revert "Improve breadcrumbs implementation [SCI-8087]"" ... This reverts commit 78d41d10a6.	2023-04-19 10:53:39 +02:00
aignatov-bio	78d41d10a6	Revert "Improve breadcrumbs implementation [SCI-8087]"	2023-04-12 14:04:20 +02:00
artoscinote	f6902ea0ef	Merge pull request #5265 from aignatov-bio/ai-sci-8272-fix-archived-results ... Fix results archived page [SCI-8272]	2023-04-07 09:56:39 +02:00
Anton	46b3791125	Fix results archived page [SCI-8272]	2023-04-06 17:16:43 +02:00
sboursen-scinote	55be84cda7	Remove missed old breadcrumbs [SCI-8087]	2023-04-05 16:29:37 +02:00
Anton	0c76d7a9b1	Merge branch 'develop' into features/navigation-refactor	2023-03-31 20:31:30 +02:00
Anton	ed1c4bcb69	Replace webpacker with jsbundling-rails [SCI-7926]	2023-03-30 13:39:57 +02:00
Anton	4a5e0de54f	Fix css for task protocol [SCI-8214]	2023-03-28 14:53:47 +02:00
Oleksii Kriuchykhin	7fff3e8f78	Merge branch 'hotfix/1.26.6.2' into develop	2023-03-20 15:36:49 +01:00
Oleksii Kriuchykhin	b67691acb5	Merge branch 'develop' into features/protocol_versioning	2023-03-17 13:53:30 +01:00
Anton	248b6b6581	Remove additional code	2023-03-17 11:11:59 +01:00
Alex Kriuchykhin	d82470aa03	Improve handling and escaping of special characters in input fields [SCI-8125] (#5135)	2023-03-13 18:00:30 +01:00
Giga Chubinidze	b59f922143	CSS: Pixel-perfect issues for Protocol templates [SCI-8100]	2023-03-13 14:25:04 +04:00
sboursen-scinote	a419943e4e	Merge 'protocol_versioning' into sb_SCI-8045	2023-03-09 16:29:40 +01:00
artoscinote	bc6afa5efa	Merge pull request #5114 from artoscinote/ma_SCI_8109 ... Fix protocol link and step delete modal styling [SCI-8109]	2023-03-09 14:53:21 +01:00
Martin Artnik	ca4a5360ed	Fix protocol link and step delete modal styling [SCI-8109]	2023-03-09 13:53:52 +01:00
Martin Artnik	69dbc036de	Display ID of original protocol in linked protocol info [SCI-8106]	2023-03-08 15:48:03 +01:00
Alex Kriuchykhin	f8a4e7ee65	Update logic for linked protocol templates with task [SCI-7973] (#5058)	2023-03-07 13:03:01 +01:00
sboursen-scinote	5e89f1f829	Update my_module protocol status dropdown [SCI-7991]	2023-03-07 05:48:20 +01:00
ajugo	b24c823597	Add linked_at to the Protocols [SCI-7964] (#5042) ... * Add linked_at to the Protocols [SCI-7964] * Add activity subject_type constrain for migration query [SCI-7964]	2023-03-01 11:33:32 +01:00
Martin Artnik	165e012d23	Replace highlight.js with prism.js [SCI-7974]	2023-02-28 16:22:35 +01:00
ajugo	96cf2f1d38	Update protocol templates update action on task [SCI-7903] (#5009) ... * Update protocol templates update action on task [SCI-7903] * Simplify logic for update from parent [SCI-7903]	2023-02-28 14:17:34 +01:00
Martin Artnik	c24b0fa5ab	Refactor access modals [SCI-7978]	2023-02-23 14:57:38 +01:00
Anton	a95ca75362	Add new protocol modal [SCI-7810]	2023-02-21 14:15:53 +01:00
ajugo	166208f186	Update i flyouts of protocols (task screen) [SCI-7861] (#5003)	2023-02-21 13:44:26 +01:00
ajugo	cb332f163f	Update the Load protocol template to task modal [SCI-7591] (#4870) ... * Update the Load protocol template to task modal [SCI-7591] * Update the Load protocol template to task modal [SCI-7591] * Load last protocol version from repository to task [SCI-7591] * Fix find_by for load_table [SCI-7591]	2023-02-14 13:19:24 +01:00
Anton	ea9d2d8291	Merge branch 'develop' into features/protocol_versioning	2023-02-14 11:07:58 +01:00
ajugo	d66dc98300	Update print protocol modal [SCI-7830] (#4932)	2023-02-06 14:23:56 +01:00
aignatov-bio	5cbaf83067	Merge pull request #4845 from aignatov-bio/ai-sci-7758-fix-user-designation-on-creation ... Fix user designation on task creation [SCI-7758]	2023-01-17 15:12:46 +01:00
aignatov-bio	8a4599bed1	Merge pull request #4831 from aignatov-bio/ai-sci-7722-fix-new-task-modal-error-handling ... Fix error handling new task modal and completed task duplication [SCI-7722][SCI-7730]	2023-01-17 13:34:13 +01:00
Anton	3b6590b8c7	Fix user designation on task creation [SCI-7758]	2023-01-17 13:33:04 +01:00
Anton	3eb18a7cf4	Fix error handling new task modal and completed task duplication[SCI-7722][SCI-7730]	2023-01-16 13:03:25 +01:00
Anton	e48657768d	Hide assigned users for user without permissions [SCI-7758]	2023-01-16 11:28:47 +01:00
artoscinote	80eb1639bc	Merge pull request #4823 from scinote-eln/features/tiny_mce_6 ... Features/tiny mce 6	2023-01-13 13:53:03 +01:00
ajugo	d8adbb1d3d	Implement completed and due date changes [SCI-7725] (#4816)	2023-01-13 10:18:35 +01:00
aignatov-bio	9216ca2809	Merge pull request #4811 from aignatov-bio/ai-sci-7722-add-new-task-modal-improvments ... Experiment table - add new task modal improvements [SCI-7722]	2023-01-13 10:13:22 +01:00