1922 commits

Author	SHA1	Message	Date
aignatov-bio	19a0d05467	Fix for checklist ordering	2020-08-14 12:32:39 +02:00
Urban Rotnik	38d3411007	Update checklist item positions with validations skip	2020-08-13 20:06:03 +02:00
Urban Rotnik	7d186156a0	Fix permission check lapsus	2020-08-11 17:00:36 +02:00
mlorb	02bb29cf79	Merge pull request #2772 from mlorb/ml-sci-4907 ... Fix inventory card view for snapshots as default view [SCI-4907]	2020-08-11 14:43:19 +02:00
Mojca Lorber	5d15e73866	Fix failing tests	2020-08-11 13:33:44 +02:00
Mojca Lorber	7af9c387cf	Fix errors	2020-08-11 10:27:23 +02:00
Urban Rotnik	29152eeb6d	Merge pull request #2783 from urbanrotnik/ur-sci-4920-permission-repository-fix ... Fix permission check [SCI-4920]	2020-08-10 15:59:21 +02:00
Miha Mencin	b333700f40	Merge pull request #2779 from okriuchykhin/ok_SCI_4910 ... Fix rendering of RTE in API [SCI-4910]	2020-08-10 15:26:35 +02:00
Urban Rotnik	e429c78d56	Fix permission check	2020-08-10 15:22:49 +02:00
aignatov-bio	67b6592470	Merge pull request #2781 from aignatov-bio/ai-sci-4919-fix-dashboard-calendar ... Fix dashboard calendar due date selection [SCI-4919]	2020-08-10 14:34:23 +02:00
aignatov-bio	a3ad8b5aab	Fix dashboard calendar due date selection	2020-08-10 12:55:56 +02:00
Miha Mencin	1080ad2821	Merge pull request #2778 from okriuchykhin/ok_SCI_4911 ... Add created_at and user to API Step serializer [SCI-4911]	2020-08-10 10:27:53 +02:00
Urban Rotnik	3c1c562e4c	Override password reset action, sign_in user only if 2fa disabled	2020-08-10 09:24:15 +02:00
Oleksii Kriuchykhin	91d9f5d6ee	Fix rendering of RTE in API [SCI-4910]	2020-08-07 16:51:57 +02:00
Oleksii Kriuchykhin	3d3fd1625c	Add created_at and user to API Step serializer [SCI-4911]	2020-08-07 14:54:05 +02:00
Miha Mencin	ae013b6fa8	join two renders	2020-08-06 14:06:23 +02:00
Miha Mencin	04c294adb1	Fix the failing test: repository row should be in correct repository	2020-08-06 13:23:40 +02:00
Mojca Lorber	3a8fc01ff7	Fix inventory card view for snapshots as default view	2020-08-05 15:43:43 +02:00
Urban Rotnik	cce76f6f0f	Merge pull request #2763 from aignatov-bio/ai-sci-4895-add-sorting-to-reults ... Add ordering for result page [SCI-4895]	2020-08-04 11:17:43 +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
Urban Rotnik	aaae33e603	Merge pull request #2764 from aignatov-bio/ai-sci-4766-add-start-date-filter-to-dashboard ... Add start date to current task dashboard filter [SCI-4766]	2020-08-03 11:56:24 +02:00
Urban Rotnik	ac3c06d882	Merge pull request #2741 from aignatov-bio/ai-sci-4748-add-export-for-assinged-items ... Add export for assigned items [SCI-4748]	2020-08-03 11:30:31 +02:00
aignatov-bio	2f5231e832	Add start date to current task dashboard filter	2020-07-29 16:09:23 +02:00
aignatov-bio	15b5f9bb68	Add ordering for result page	2020-07-28 15:39:29 +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
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
Alex Kriuchykhin	d4408f6af7	Merge pull request #2738 from aignatov-bio/ai-sci-4732-add-pagination-to-results ... Add pagination to results page [SCI-4732]	2020-07-23 14:45:10 +02:00
aignatov-bio	04a6a2a250	Small fixes	2020-07-23 11:35:22 +02:00
Alex Kriuchykhin	cb9fe04584	Merge pull request #2745 from aignatov-bio/ai-sci-4785-fix-inventories-activity-filters ... Fix global activities filters [SCI-4785]	2020-07-23 10:09:36 +02:00
aignatov-bio	005bfb2ba7	Fix merge conflicts	2020-07-22 12:37:18 +02:00
aignatov-bio	ddfe8231d8	Merge branch 'features/2fa' into develop	2020-07-22 11:56:36 +02:00
Urban Rotnik	3232b4d6bf	Add test for canvas_controller	2020-07-21 13:49:59 +02:00
aignatov-bio	75930b99c3	Fix global activities filters	2020-07-20 15:01:00 +02:00
aignatov-bio	e69e3ea8d3	Add export for assigned items	2020-07-17 15:17:09 +02:00
aignatov-bio	7c4bfad09b	Add pagination to results page	2020-07-16 15:47:19 +02:00
aignatov-bio	c592954400	Add UX	2020-07-13 16:05:23 +02:00
aignatov-bio	7d20bf6fea	Add recovery screen	2020-07-13 09:51:04 +02:00
Oleksii Kriuchykhin	b4fab62d38	Merge branch 'develop' into ok_SCI_4776	2020-07-10 13:40:46 +02:00
aignatov-bio	fef6e5f1db	Add recovery strategy for 2fa	2020-07-09 17:01:00 +02:00
Urban Rotnik	721f3accbe	Merge pull request #2694 from urbanrotnik/ur-sci-4790 ... Show assigned users modal also for view only [SCI-4790]	2020-07-09 16:12:20 +02:00
Urban Rotnik	d2415c3b1d	Show assigned users modal also for view	2020-07-09 15:11:53 +02:00
Urban Rotnik	d8d0f7ef8e	Fix counter in assign dropdown menu on task	2020-07-09 14:50:37 +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
Urban Rotnik	950f65b90e	Merge pull request #2715 from urbanrotnik/ur-sci-4771-improve-report-layout ... Improve report layout [SCI-4771]	2020-07-09 11:48:33 +02:00
mlorb	efbef2c876	Merge pull request #2384 from mlorb/ml-sci-4261 ... Clean up controllers for manage repository columns [SCI-4261]	2020-07-09 09:18:23 +02:00
Mojca Lorber	de9df7f1b0	Add NotImplementedError	2020-07-08 13:28:12 +02:00
Urban Rotnik	d6f37ce28e	Merge pull request #2710 from urbanrotnik/ur-sci-4568-remove-flash-message ... Remove flash message for redirects from root url [SCI-4568]	2020-07-08 11:42:05 +02:00