36 commits

Author	SHA1	Message	Date
Anton	f6783b219b	Fix smart annotations [SCI-9605][SCI-9772]	2023-11-27 11:38:54 +01:00
ajugo	5878ed0c7c	Fix unit test [SCI-9570] (#6552)	2023-11-13 09:34:38 +01:00
Anton	5aa01716ef	Fix bundling for deleted files	2023-08-07 15:42:13 +02:00
Anton	1087f67228	Merge branch 'develop' into features/remove-front-end-gems	2023-07-18 14:36:40 +02:00
wandji	ebe1bd583f	Fix issue json response for creating result table [SCI-8853] (#5768) ... * Fix issue json resposnse for creating result table [SCI-8853] * Fix linter errors [SCI-8853] * Fix linter errors [SCI-8853] * Fix issues when editing and updating results text/table for task [SCI-8853] * Fix linter errors [SCI-8853]	2023-07-14 12:30:36 +02:00
Anton	4b82ba9613	Merge branch 'features/rails-upgrade' into features/remove-front-end-gems	2023-07-06 11:14:48 +02:00
Alex Kriuchykhin	5f1c6bf2f0	Fix multiple issues after Rails upgrade [SCI-8780] (#5716)	2023-07-05 12:43:23 +02:00
Anton	b956f9de25	Remove bootstrap form	2023-07-03 12:59:13 +02:00
ajugo	67dcbb0fa6	Open the correct experiment view [SCI-7662][SCI-7741] (#4798) ... * Fix experiment view loading [SCI-7662] * Fix experiment view loading [SCI-7662]	2023-01-12 11:31:04 +01:00
Oleksii Kriuchykhin	3b474fc9f0	Improve activity records creation in controllers [SCI-7505]	2022-11-24 15:19:17 +01:00
aignatov-bio	c248e87adb	Add permissions checks for results controllers [SCI-6071] (#3555) ... * Add permission tests for results controller [SCI-6071] * Update results controllers with new permissions [SCI-6071] * Small fixes to results controllers [SCI-6071] * Update result permission helpers [SCI-6071]	2021-09-24 13:11:41 +02:00
Martin Artnik	e8f57e9e99	Reworked MyModule permissions [SCI-6056]	2021-09-14 11:08:35 +02:00
aignatov-bio	15b5f9bb68	Add ordering for result page	2020-07-28 15:39:29 +02:00
aignatov-bio	7c4bfad09b	Add pagination to results page	2020-07-16 15:47:19 +02:00
aignatov-bio	6e5f078dea	Add activities for marvinJS [SCI-3630] (#1950) ... * Add marvinJs activities to step and results * Add activities for TinyMCE marvinJS assets * Fix markup	2019-08-09 09:47:07 +02:00
Anton Ignatov	aa2dab2014	Merge branch 'features/note-section' into master-with-note-section	2019-04-23 10:31:37 +02:00
Miha Mencin	9a30d7be9d	SCI-3232 renaming the attribute name so it doesnt get 'constantized'	2019-03-26 11:39:54 +01:00
Anton Ignatov	4ec0a3c871	Update TinyMCE image loader for new fields	2019-03-22 10:52:26 +01:00
Anton Ignatov	07c2819163	refactoring tinymce image uploading	2019-03-20 14:46:54 +01:00
Mojca Lorber	7757096693	Results activities refactoring	2019-03-19 15:33:57 +01:00
Matej Zrimšek	b8b9707c06	Fixed protocol and archive permission calls, fixed result permissions; module group managing is now also allowed on newly created groups; other permission call fixes and some refactoring.	2018-02-19 14:51:14 +01:00
Matej Zrimšek	6ba226d514	Added missing '?' to the canaid permission calls that were missing it.	2018-02-16 11:12:30 +01:00
Matej Zrimšek	8ef6c8f91f	Refactored remaining experiment level permissions (and everything below it).	2018-02-14 14:39:07 +01:00
zmagod	3dc3ed906f	fixes bug with embedded images [fixes SCI.1624]	2017-10-02 18:06:42 +02:00
Oleksii Kriuchykhin	7310763184	Add missing include [SCI-1306]	2017-05-25 08:57:50 +02:00
Zmago Devetak	4b816f5322	Merge pull request #568 from ZmagoD/zd_SCI_1119 ... Add images to fields with rich text formatting	2017-05-08 13:06:58 +02:00
zmagod	d6f303581f	refactor	2017-05-08 12:56:33 +02:00
zmagod	5b58824ec0	refactor	2017-05-03 15:30:08 +02:00
zmagod	66f43803c0	refactor, fix user annotation bug	2017-04-24 16:22:25 +02:00
zmagod	55c8c498e2	add image upload functionality to result text	2017-04-24 12:28:27 +02:00
Mojca Lorber	0bae4657f6	add experiment level to user smart annotation notification	2017-04-20 13:21:02 +02:00
Mojca Lorber	b1e939e715	add experiment to activities	2017-04-20 13:16:11 +02:00
zmagod	bb437bd8c5	adds notification to results annotation	2017-04-06 09:33:49 +02:00
Mojca Lorber	3e162b3a93	remove redcarpet gem - markdown	2016-11-10 14:11:32 +01:00
Jure Grabnar	1ca34a7986	Fix result texts/tables	2016-08-10 15:44:33 +02:00
Luka Murn	055298fee8	Initial commit.	2016-02-12 16:52:43 +01:00