124 commits

Author	SHA1	Message	Date
Oleksii Kriuchykhin	a518bfe023	Enable time fraction for task due date [SCI-4408]	2020-03-16 17:55:35 +01:00
Oleksii Kriuchykhin	b0c785f4fb	Extend inventory import to support new data types [SCI-4220]	2020-02-03 15:20:01 +01:00
Oleksii Kriuchykhin	eed68a2590	Refactor repository cell clonning to support all data types [SCI-4204]	2020-01-14 16:55:10 +01:00
Oleksii Kriuchykhin	01b8d2226d	Optimize repository table counters [SCI-4224]	2020-01-13 16:31:42 +01:00
Oleksii Kriuchykhin	7b82e33eb6	Fix repository filtering and improve speed [SCI-4224]	2020-01-13 16:09:07 +01:00
Oleksii Kriuchykhin	16b591b110	Fix sidebar update for inline editing [SCI-4000]	2020-01-06 16:07:23 +01:00
aignatov-bio	68284c10da	Add task description and task protocol description activities	2019-11-27 14:37:53 +01:00
Oleksii Kriuchykhin	3509543e7b	Merge branch 'master' into ok_SCI_3881	2019-09-16 11:56:49 +02:00
Miha Mencin	d522b3807a	codestyle improvements	2019-09-06 14:59:30 +02:00
Miha Mencin	7fc5035d2d	PR fixes, codestyle fixes	2019-09-06 13:47:06 +02:00
Miha Mencin	2486bd0077	SCI3818-unshared-inventory-screen	2019-09-05 14:03:08 +02:00
aignatov-bio	b6661682ad	Fix shared inventory in task dropdown (#1993)	2019-08-19 13:56:02 +02:00
Mojca Lorber	cac7dab440	Show shared inventories in left navigation and fix read repository permission	2019-08-09 14:13:00 +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
aignatov-bio	52a2f5cd0e	Add recent protocols dropdown to task page [SCI-3417] (#1800) ... * Add recent protocols dropdown to task page	2019-06-13 15:47:29 +02:00
Oleksii Kriuchykhin	1128fedc51	Refactor title inline editing permission checking [SCI-3471]	2019-05-20 13:13:31 +02:00
Anton Ignatov	652fba0e23	Merge branch 'master-with-note-section'	2019-05-13 11:08:11 +02:00
Oleksii Kriuchykhin	40550f92c9	Improve HTML data escaping in JSON endpoints [SCI-3403]	2019-05-08 17:38:24 +02:00
Anton Ignatov	7d60eb5572	Fix migration issues	2019-04-23 11:11:22 +02:00
Anton Ignatov	aa2dab2014	Merge branch 'features/note-section' into master-with-note-section	2019-04-23 10:31:37 +02:00
Oleksii Kriuchykhin	a43e42fdb3	Fix crash when no activities present [SCI-3340]	2019-04-15 10:51:59 +02:00
Oleksii Kriuchykhin	231106e131	Switch to kaminari pagination in global activities [SCI-3292]	2019-04-12 15:37:45 +02:00
Urban Rotnik	86ddbc68b6	fixup! Show date actual value without link	2019-04-02 14:21:06 +02:00
Urban Rotnik	8eaeeee9f8	Show date actual value without link	2019-04-02 13:15:34 +02:00
aignatov-bio	e6102c72c7	Adding missed activities [SCI-3253] (#1614) ... * Adding missed activties * Adding test for activities	2019-04-02 11:50:37 +02:00
aignatov-bio	b51dcc9d75	Adding children selector to global activities subjects [SCI-3247] (#1605) ... * Adding children selector to global activities subjects * Fix naming, add seperate check for project id	2019-03-29 09:26:27 +01:00
mlorb	5f663b3c74	Merge pull request #1600 from mlorb/ml-sci-3215 ... Implement missing tests for global activities [SCI-3215][SCI-3219]	2019-03-28 11:10:38 +01:00
aignatov-bio	08263ab64e	adding filters for task activities [SCI-3076] (#1553) ... * update task activity screen	2019-03-28 10:55:48 +01:00
Mojca Lorber	f06358b2ae	Implement missing tests for global activities (task and protocol activities)	2019-03-27 11:24:44 +01:00
Anton Ignatov	4ec0a3c871	Update TinyMCE image loader for new fields	2019-03-22 10:52:26 +01:00
Mojca Lorber	c55e314ed5	Refactor upon the review requests	2019-03-20 21:34:47 +01:00
Oleksii Kriuchykhin	0c2b7959b6	Fix smart annotations in RTE [SCI-3111]	2019-03-20 11:41:36 +01:00
Mojca Lorber	c476816359	Task activities refactoring, without tests	2019-03-19 15:33:57 +01:00
Urban Rotnik	2ea2700837	fixup! Fix failing tests	2019-03-15 10:30:51 +01:00
Oleksii Kriuchykhin	a822227383	Add rich text editor to task and protocol description [SCI-3062][SCI-3071]	2019-03-14 16:27:33 +01:00
Urban Rotnik	3f18166320	Add Task and TaskTags activities	2019-03-12 09:15:06 +01:00
Oleksii Kriuchykhin	132f46b136	Improve error handling in task inventories dropdown [SCI-2776]	2019-01-10 21:11:20 +01:00
Oleksii Kriuchykhin	534866467b	Add counters to task inventories dropdown [SCI-2776]	2019-01-03 14:11:00 +01:00
Oleksii Kriuchykhin	d5c07fd22a	Improve rendering speed of inventory table [SCI-2910]	2018-12-13 16:17:22 +01:00
mlorb	426fadc10a	Fix due date can not be set	2018-12-11 10:31:13 +01:00
Oleksii Kriuchykhin	537de596a7	Merge latest master [SCI-2778]	2018-11-14 13:05:57 +01:00
Luka Murn	84df2c81f9	Merge branch 'features/export-all' ... Conflicts: app/controllers/experiments_controller.rb app/controllers/my_modules_controller.rb db/schema.rb	2018-11-13 09:14:02 +01:00
Oleksii Kriuchykhin	8d0dbc7076	Add time format selection to settings [SCI-2778]	2018-11-09 16:19:40 +01:00
Matej Zrimšek	18e52e2c6f	Fix fetching all user projects [SCI-2787]	2018-10-24 00:29:30 +02:00
Oleksii Kriuchykhin	84428b37c2	Add project view JSON endpoints [SCI-2728]	2018-09-21 10:39:20 +02:00
Zanz2	b26530a02f	Found a new, and more elegant fix inside controller with Luka	2018-08-28 14:48:23 +02:00
zmagod	f769215468	fixes assign items flash message [fixes SCI-2487]	2018-06-08 10:02:57 +02:00
Oleksii Kriuchykhin	2ddc0fb561	Improve sidebar rendering performance [SCI-2478]	2018-06-01 13:49:02 +02:00
zmagod	89046e9787	fixes items assign flash message [fixes SCI-2395]	2018-05-29 12:54:41 +02:00
zmagod	10351bbf83	fixes tast description/due-date modal [fixes SCI-2433]	2018-05-24 16:44:10 +02:00