644 commits

Author	SHA1	Message	Date
Urban Rotnik	f5118e5461	Merge pull request #2901 from okriuchykhin/ok_SCI_5063 ... Refactor experiment workflow image generation [SCI-5063]	2020-10-29 13:55:23 +01:00
Urban Rotnik	c6a891bcea	Merge pull request #2912 from urbanrotnik/ur-sci-5091 ... Add current team to smart annotations permission check [SCI-5091]	2020-10-29 13:32:29 +01:00
Oleksii Kriuchykhin	13fcfedf41	Refactor experiment workflow image generation [SCI-5063]	2020-10-29 13:16:09 +01:00
Urban Rotnik	25d050cec4	Add current team to smar annotations permission check	2020-10-29 12:17:40 +01:00
Urban Rotnik	aa1520bfb8	Merge branch 'develop' into jg_sci_2228	2020-10-22 14:21:39 +02:00
Urban Rotnik	a19e0ef846	Refactor	2020-10-13 14:23:39 +02:00
Urban Rotnik	dfca798e2d	Refactored tiny_mce_table parser and renderer	2020-10-09 09:43:36 +02:00
Urban Rotnik	92b4d95c72	Implement lists in DOCX	2020-10-09 09:43:00 +02:00
Alex Kriuchykhin	3eb448c39b	Merge pull request #2862 from okriuchykhin/ok_SCI_5001 ... Add Endpoins for Project Membership manipulation [SCI-5001]	2020-09-25 14:25:20 +02:00
Urban Rotnik	a9d8d008a3	Fix tests	2020-09-23 13:05:17 +02:00
Oleksii Kriuchykhin	2cda80dc5f	Add Endpoins for Project Membership manipulation [SCI-5001]	2020-09-23 11:03:29 +02:00
Alex Kriuchykhin	136ce06022	Merge pull request #2851 from okriuchykhin/ok_SCI_4999 ... Add Create and Update endpoints for experiments [SCI-4999]	2020-09-22 10:20:00 +02:00
Alex Kriuchykhin	e19efe3975	Merge pull request #2850 from okriuchykhin/ok_SCI_4997 ... Add Create and Update endpoints for projects [SCI-4997]	2020-09-21 13:22:12 +02:00
aignatov-bio	e5d3fac112	Merge branch 'features/smart-annotation-improvements' into develop	2020-09-17 14:52:51 +02:00
aignatov-bio	6ed8757eb1	Merge branch 'features/task-flows' into develop	2020-09-17 14:52:05 +02:00
Oleksii Kriuchykhin	0147e1aee1	Add Create and Update endpoints for experiments [SCI-4999]	2020-09-16 23:15:36 +02:00
Oleksii Kriuchykhin	dd4a62bb45	Add Create and Update endpoints for projects [SCI-4997]	2020-09-16 17:03:39 +02:00
Oleksii Kriuchykhin	57716fd89c	Fix API and tests for new task completion logic [SCI-5004]	2020-09-15 11:19:25 +02:00
Urban Rotnik	0ae39678d4	Merge pull request #2832 from urbanrotnik/ur-sci-4982-lock-state ... Add error message for locked task, update some permission checks[SCI-4982]	2020-09-09 14:04:08 +02:00
Urban Rotnik	45a09e5a3c	Fix tests	2020-09-09 13:17:07 +02:00
Alex Kriuchykhin	c413ac21a1	Merge pull request #2798 from aignatov-bio/ai-sci-4831-update-api-for-new-statuses ... Add API endpoints for workflows [SCI-4831]	2020-09-08 16:23:05 +02:00
aignatov-bio	97db1e0e1c	Fix tests	2020-09-08 14:57:26 +02:00
Mojca Lorber	0eb81065b3	Fix tests	2020-09-08 09:39:15 +02:00
aignatov-bio	4c7312faf9	Add tests for new workflow endpoints	2020-09-02 11:43:00 +02:00
aignatov-bio	e1229f5606	Fix test and status validations	2020-09-01 14:49:58 +02:00
Urban Rotnik	581cd69963	Add activities for status change	2020-09-01 11:48:04 +02:00
Urban Rotnik	b6e68ec1e2	Remove tests	2020-08-31 16:56:40 +02:00
Urban Rotnik	a259800590	Merge branch 'develop' into jg_sci_2228	2020-08-31 16:29:23 +02:00
Urban Rotnik	fb8f69c3e4	Revert controllers spec	2020-08-27 13:49:32 +02:00
Mojca Lorber	6fefd4d945	Add factories for new task flows models	2020-08-27 13:38:32 +02:00
Urban Rotnik	a5fb873d19	Add default workflow	2020-08-27 10:54:39 +02:00
Oleksii Kriuchykhin	ed2eb81c68	Switch to position swapping when updating step position [SCI-4880]	2020-08-25 15:46:23 +02:00
Urban Rotnik	7c14da70d9	Merge branch 'features/task-flows' into develop_to_task_flows	2020-08-04 14:50:46 +02:00
Alex Kriuchykhin	22015beeb5	Merge pull request #2757 from urbanrotnik/ur-sci-4813-base64-multipart-upload ... Extend asset API upload to support base64 [SCI-4813]	2020-08-04 09:43:01 +02:00
Urban Rotnik	9b06510dcc	Update PUT result file endpoint, refactor	2020-08-03 15:14:58 +02:00
Oleksii Kriuchykhin	1a8333612a	Merge branch 'features/pwa' into develop	2020-07-27 09:47:41 +02:00
Urban Rotnik	4958139699	Extend asset API upload to support base64	2020-07-24 14:57:03 +02:00
Urban Rotnik	025378cd0e	Fix translations and JS	2020-07-23 15:53:46 +02:00
Alex Kriuchykhin	26cfa001c8	Merge pull request #2747 from urbanrotnik/ur-sci-4769-canvas-test ... Add test for canvas_controller [SCI-4769]	2020-07-23 15:18:01 +02:00
Urban Rotnik	aecd6b228b	Merge pull request #2744 from urbanrotnik/ur-sci-4764-increase-characters-limit-for-rte ... Increase chars limit for RTE [SCI-4764]	2020-07-23 12:58:36 +02:00
Urban Rotnik	512d6f3229	Add actions for update status, clean old complete actions	2020-07-22 16:12:34 +02:00
aignatov-bio	ddfe8231d8	Merge branch 'features/2fa' into develop	2020-07-22 11:56:36 +02:00
Oleksii Kriuchykhin	809e0c7d77	Fix tests for MyModule [SCI_4825]	2020-07-21 16:20:19 +02:00
Urban Rotnik	3232b4d6bf	Add test for canvas_controller	2020-07-21 13:49:59 +02:00
Urban Rotnik	9dffc27428	Increase chars limit for RTE	2020-07-20 13:33:38 +02:00
Oleksii Kriuchykhin	7fd004baa8	Prepare database structure and relations for statuses phase one [SCI-4825]	2020-07-17 18:04:09 +02:00
aignatov-bio	cadbc3e47b	Fix tests	2020-07-14 11:20:06 +02:00
Oleksii Kriuchykhin	b4fab62d38	Merge branch 'develop' into ok_SCI_4776	2020-07-10 13:40:46 +02:00
Urban Rotnik	b11f166c38	Fix cucumber tests	2020-07-09 13:14:07 +02:00
aignatov-bio	6245e19069	Merge pull request #2718 from biosistemika/master ... Merge master to develop	2020-07-09 12:56:31 +02:00