3288 commits

Author	SHA1	Message	Date
aignatov-bio	689967f82c	Add Scinote Report Template [SCI-5686]	2021-05-05 15:13:06 +02:00
aignatov-bio	3fc4ab9892	Add warning modal on project and template change [SCI-5684]	2021-05-05 12:13:52 +02:00
Oleksii Kriuchykhin	a307a16033	Fix handsontable assets inclusion in report templates [SCI-5692]	2021-05-04 16:05:19 +02:00
aignatov-bio	9ca7b76a1f	Fix report assigned repository items	2021-05-04 12:49:38 +02:00
Oleksii Kriuchykhin	e98ccd2860	Add confirmation modal for report regeneration action [SCI-5622]	2021-05-03 16:10:14 +02:00
aignatov-bio	3d80deb51a	Add pagination to report title page [SCI-5667] (#3275)	2021-05-03 15:27:17 +02:00
aignatov-bio	705fb1e43d	Add report front-end validations and close wizard modals [SCI-5666] (#3273) ... * Add report front-end validations and close wizard modals * Add constant to report name validation [SCI-5666]	2021-05-03 15:24:27 +02:00
aignatov-bio	01dfd305ab	Add warning modal to report edit mode [SCI-5621] (#3266) ... * Add warning modal to report edit mode [SCI-5621] * Move report editing modal to partial [SCI-5621]	2021-05-03 15:17:23 +02:00
aignatov-bio	7752267808	Add styling for template values [SCI-5630] (#3264)	2021-05-03 15:17:09 +02:00
Oleksii Kriuchykhin	1b8265343e	Add full-page display to PDF Report of all pages of the attached Word and PDF files in the Results [SCI-5636]	2021-05-03 11:45:45 +02:00
zmagoD	47cb1b31dc	fix code style	2021-05-02 11:36:10 +02:00
zmagoD	c1d98f421d	update scenarios and UI logic to handle project page reload after modal close	2021-05-02 11:22:59 +02:00
zmagoD	63bbc609ef	style modal	2021-04-30 16:02:59 +02:00
zmagoD	f1ced42ae6	add filtering logic	2021-04-30 15:25:08 +02:00
zmagoD	11e5662c47	add fe logic for disable/enable fields	2021-04-30 13:26:06 +02:00
aignatov-bio	86854b015d	Add third template to reports [SCI-5618]	2021-04-29 15:21:58 +02:00
aignatov-bio	6b023603f9	Add second template for reports [SCI-5617] (#3268)	2021-04-29 10:42:17 +02:00
zmagoD	8a74546cdf	fix the logic for addin/editing new project members	2021-04-28 18:02:18 +02:00
Oleksii Kriuchykhin	bca88188de	Limit created report relations depth to tasks [SCI-5665]	2021-04-28 15:33:30 +02:00
Oleksii Kriuchykhin	8a915c8acf	Fix assets inclusion into report [SCI-5680]	2021-04-28 14:37:16 +02:00
aignatov-bio	7c75f170d0	Add repositories settings to report wizard [SCI-5648] (#3269) ... * Add repositories settings to report wizard [SCI-5648] * Move repositories from report settings to content [SCI-5648]	2021-04-28 09:54:00 +02:00
zmagoD	c136d953d0	create form object for role assigment, create helper object for project member, added new user_projects modal	2021-04-24 18:43:28 +02:00
Alex Kriuchykhin	fe48e35cf0	Merge pull request #3263 from okriuchykhin/ok_SCI_5609 ... Add additional custom fields for reports [SCI-5609]	2021-04-23 10:53:59 +02:00
Oleksii Kriuchykhin	ecbf747499	Switch to base64 encoded assets in wiked_pdf templates	2021-04-22 14:52:41 +02:00
Oleksii Kriuchykhin	a67cc619ec	Add additional custom fields for reports [SCI-5609]	2021-04-20 13:57:09 +02:00
aignatov-bio	d18a54c874	Update create and update action for reports controller [SCI-5641] (#3260) ... Update create and update action [SCI-5641]	2021-04-20 13:35:40 +02:00
zmagoD	04ef7a4478	add show and edit permissions modal	2021-04-18 17:19:16 +02:00
zmagoD	3333241c9a	add CTA for project members modal SCI-5645	2021-04-18 12:23:29 +02:00
Miha Mencin	f95e9402bd	Merge pull request #3258 from okriuchykhin/ok_SCI_5613 ... Fix save report PDF to Inventory [SCI-5613]	2021-04-15 09:30:04 +02:00
Alex Kriuchykhin	80827ce761	Merge pull request #3257 from biosistemika/SCI-5623-add-external-id-to-user ... SCI-5623 add external id to user	2021-04-14 16:15:43 +02:00
Oleksii Kriuchykhin	fe8f006f6e	Fix save report PDF to Inventory [SCI-5613]	2021-04-14 16:06:59 +02:00
Oleksii Kriuchykhin	0a9a656313	Add flash message and notification for generated reports [SCI-5552]	2021-04-14 15:45:51 +02:00
miha	ac18cb7225	rename partial to include html	2021-04-14 14:07:55 +02:00
Oleksii Kriuchykhin	df8354bde3	Move the docx creation to the Delayed job [SCI-5560]	2021-04-14 12:39:36 +02:00
aignatov-bio	85a13b7182	Update condition for project content [SCI-5620]	2021-04-14 11:51:03 +02:00
aignatov-bio	bccd474cc6	Add edit mode for report [SCI-5620]	2021-04-14 11:51:03 +02:00
aignatov-bio	d991b631fb	Merge pull request #3252 from aignatov-bio/ai-sci-5593-add-logic-for-preparing-wizard-data-for-report ... Add logic for preparing wizard data for report [SCI-5593]	2021-04-14 11:04:55 +02:00
miha	e610683d5c	[SCI-5623] added external_id setting to user	2021-04-14 09:44:09 +02:00
Alex Kriuchykhin	1df86c36d9	Merge pull request #3254 from okriuchykhin/ok_SCI_5637 ... Implement PDF report generation in delayed job [SCI-5637]	2021-04-13 16:37:16 +02:00
Oleksii Kriuchykhin	f864f551d5	Implement PDF report generation in delayed job [SCI-5637]	2021-04-12 13:04:02 +02:00
aignatov-bio	101d46956c	Add logic for preparing wizard data for report [SCI-5593]	2021-04-12 12:42:22 +02:00
Oleksii Kriuchykhin	67302da968	Add settings to reports [SCI-5612]	2021-04-08 17:40:16 +02:00
aignatov-bio	14f8e97b5f	Add I18n for reports wizard second step [SCI-5572]	2021-04-08 12:04:34 +02:00
aignatov-bio	e6edbf55f3	Add report wizard step 2 [SCI-5572]	2021-04-08 12:00:08 +02:00
aignatov-bio	a1d6c30ef7	Add report wizard step 3 [SCI-5611]	2021-04-07 16:37:08 +02:00
Alex Kriuchykhin	aa21d7e415	Merge pull request #3247 from okriuchykhin/ok_SCI_5591 ... Add dynamic form elements in report wizard step 1 [SCI-5591]	2021-04-07 12:05:10 +02:00
aignatov-bio	a46b9cb8ea	Add document preview to reports [SCI-5559]	2021-04-07 11:15:22 +02:00
Oleksii Kriuchykhin	a9ac8452f2	Add dynamic form elements in report wizard step 1 [SCI-5591]	2021-04-06 13:56:24 +02:00
aignatov-bio	82be23db81	Add project and template selector [SCI-5570]	2021-03-31 15:32:03 +02:00
Alex Kriuchykhin	c9688a58f7	Merge pull request #3241 from aignatov-bio/ai-sci-5571-add-template-partial-to-report ... Add template partials to reports [SCI-5571]	2021-03-31 11:36:56 +02:00
aignatov-bio	ecca155fab	Added layout for footer and header [SCI-5571]	2021-03-30 23:43:34 +02:00
aignatov-bio	ad8e404bca	Add template partials to reports [SCI-5571]	2021-03-30 13:40:36 +02:00
Miha Mencin	6ad3f7b92f	Merge pull request #3239 from okriuchykhin/ok_SCI_5595_v2 ... Remove canvas-to-blob library [SCI-5595]	2021-03-29 14:03:35 +02:00
Oleksii Kriuchykhin	2f6194a99f	Remove canvas-to-blob library [SCI-5595]	2021-03-29 14:02:30 +02:00
aignatov-bio	1c93131ff1	Fix folders breadcrumbs [SCI-5597]	2021-03-26 11:58:18 +01:00
aignatov-bio	0ba6eec73c	Merge pull request #3232 from aignatov-bio/ai-sci-5564-fix-breadcrumbs-for-experiments-page ... Remove the project from experiments page breadcrumbs [SCI-5564]	2021-03-25 15:41:49 +01:00
aignatov-bio	b5cb46908c	Merge pull request #3225 from aignatov-bio/ai-sci-5563-add-reload-action-to-inline-asset ... Add reload action for assets [SCI-5563]	2021-03-25 15:40:36 +01:00
aignatov-bio	9281a5631c	Remove project from experiments page breadcrumbs [SCI-5564]	2021-03-25 14:32:05 +01:00
aignatov-bio	32b1db629a	Change button_to to link_to [SCI-5563]	2021-03-25 14:21:24 +01:00
aignatov-bio	0920d0a5cd	Add reports wizzard layout [SCI-5569]	2021-03-25 13:21:54 +01:00
Miha Mencin	4fa1f350e4	Merge pull request #3221 from aignatov-bio/ai-sci-5564-small-breadcrumbs-fixes ... Small breadcrumbs fixes [SCI-5564]	2021-03-24 09:46:09 +01:00
aignatov-bio	e4256342d9	Fix smart annotation in experiment details modal [SCI-5583]	2021-03-22 15:36:10 +01:00
aignatov-bio	7c573a1ee9	Add reload action for assets [SCI-5563]	2021-03-22 13:02:13 +01:00
aignatov-bio	d3d79f4288	Small breadcrumbs fixes [SCI-5564]	2021-03-18 14:24:33 +01:00
aignatov-bio	3e5c2e83c7	Update toolbar, add docx and pdf columns [SCI-5549][SCI-5550]	2021-03-17 12:54:25 +01:00
aignatov-bio	c99e8f19fd	Add basic layout [SCI-5548]	2021-03-16 13:11:51 +01:00
aignatov-bio	e8310f9b2e	Merge pull request #3212 from aignatov-bio/ai-sci-5431-implement-flyout-for-long-breadcrumbs ... Add dropdown to breadcrumbs [SCI-5431]	2021-03-12 14:33:19 +01:00
aignatov-bio	63744b6a04	Add dropdown to breadcrumbs [SCI-5431]	2021-03-12 12:21:10 +01:00
Urban Rotnik	07ba11c140	Fix icons in export_all and print mode	2021-03-10 12:42:12 +01:00
Urban Rotnik	8202181095	Merge pull request #3186 from urbanrotnik/ur-sci-4140-fix-notifications ... Bring back old notifications [SCI-4140]	2021-03-09 14:54:08 +01:00
Urban Rotnik	ee39224f73	Merge pull request #3206 from urbanrotnik/ur-sci-5518 ... Fix titles hovering breadcrumbs [SCI-5518]	2021-03-09 13:59:20 +01:00
Urban Rotnik	8bacc74c17	Merge pull request #3187 from urbanrotnik/ur-sci-5439 ... Fix report completed_on time and username [SCI-5439]	2021-03-09 13:27:24 +01:00
Urban Rotnik	419b69ef60	Fix syntax error ... SCI-5518	2021-03-08 22:04:28 +01:00
Urban Rotnik	919eeb2783	Fix titles to one line ... SCI-5518	2021-03-08 22:04:19 +01:00
Urban Rotnik	e1db291729	Merge pull request #3200 from urbanrotnik/ur-sci-5525 ... Add breadcrumbs on Experiments and Tasks pages [SCI-5525]	2021-03-08 14:13:44 +01:00
Urban Rotnik	dd302142eb	Merge pull request #3194 from urbanrotnik/ur-sci-5498 ... Fix grayed links when subjects gets deleted [SCI-5498]	2021-03-08 14:12:05 +01:00
Urban Rotnik	96ef0c10da	Merge pull request #3148 from urbanrotnik/ur-sci-5450-remamber-user-view-mode ... Store Table/Cards view setting per user [SCI-5450]	2021-03-08 11:48:33 +01:00
aignatov-bio	ea424e4a12	Merge pull request #3161 from mlorb/ml-sci-5323 ... Implement styling for the inventories empty state [SCI-5323]	2021-03-08 11:42:48 +01:00
aignatov-bio	a4227874e3	Add empty office files placeholder [SCI-5490]	2021-03-08 11:35:15 +01:00
aignatov-bio	7ff6cc17ad	Merge pull request #3197 from aignatov-bio/ai-sci-5483-fix-click-zone-for-manage-users-buttons ... Fix click zone for manage users buttons [SCI-5483]	2021-03-08 11:31:41 +01:00
aignatov-bio	df4297f6f7	Merge branch 'develop' into features/local_file_previews	2021-03-08 11:30:47 +01:00
aignatov-bio	ab33f51a59	Merge pull request #3184 from aignatov-bio/ai-sci-5460-add-long-names-navigation-tootip ... Add titles to navigation items [SCI-5460]	2021-03-08 10:17:52 +01:00
Urban Rotnik	235f19cf25	Store Table/Cards view setting per user ... SCI-5450	2021-03-04 14:56:59 +01:00
Urban Rotnik	401224ae11	Add breadcrumbs on Experiments and Tasks pages	2021-03-04 09:00:58 +01:00
aignatov-bio	dcea1b558b	Fix click zone for manage users buttons [SCI-5483]	2021-03-02 15:32:53 +01:00
Urban Rotnik	fd6165bc55	Fix grayed links when subjects gets deleted	2021-03-02 11:13:08 +01:00
aignatov-bio	89ac76a766	Fix duplcated new step button [SCI-5474]	2021-02-26 12:29:31 +01:00
Urban Rotnik	8ca8c84efd	Fix report completed_on time and username (partially) ... SCI-5439 We cannot realy on last_modified_by, because it can be changed after step completion	2021-02-25 13:24:21 +01:00
Urban Rotnik	1bb2393655	Use translations ... SCI-4140	2021-02-25 11:59:26 +01:00
aignatov-bio	24134174fc	Add titles to navigation items [SCI-5460]	2021-02-23 15:00:11 +01:00
Oleksii Kriuchykhin	bdd717b21b	Refactor view project users modal [SCI-5387]	2021-02-22 22:37:32 +01:00
Oleksii Kriuchykhin	e8b4a30b87	Improve inventory table loading speed [SCI-5509]	2021-02-22 10:34:06 +01:00
Urban Rotnik	3bca05fc94	Prevent showing empty files for experiments without Tasks ... SCI-5481	2021-02-18 12:03:28 +01:00
Urban Rotnik	6ea39c9363	Add experiment thumbnail, update archived view for experiments ... SCI-5481	2021-02-18 12:03:13 +01:00
aignatov-bio	d2c03f27c3	Merge pull request #3170 from aignatov-bio/ai-sci-5492-fix-shared-inventories ... Fix shared inventories [SCI-5492]	2021-02-18 11:05:18 +01:00
aignatov-bio	1cfd9dd85e	Merge pull request #3163 from aignatov-bio/ai-sci-5469-update-experiment-card-css ... Update experiment card css [SCI-5469]	2021-02-18 10:45:43 +01:00
aignatov-bio	99c3e1430b	Fix shared inventories [SCI-5492]	2021-02-17 15:14:32 +01:00
aignatov-bio	171468444d	Fix method on experiment archive action	2021-02-16 12:55:41 +01:00
aignatov-bio	0368579799	Update experiment card css [SCI-5469]	2021-02-16 12:42:09 +01:00
Mojca Lorber	456d9c713f	Implement styling for the inventories empty state	2021-02-15 21:01:31 +01:00
aignatov-bio	cc2edaf71a	Fix dahsboard CSS [SCI-5249][SCI-5489]	2021-02-15 12:40:26 +01:00
mlorb	20dc9967f5	Merge pull request #3113 from mlorb/ml-sci-5311 ... Implement the option of deleting empty folders [SCI-5311]	2021-02-15 10:27:05 +01:00
mlorb	78a76ea3a1	Merge pull request #3154 from mlorb/ml-sci-5470 ... Add no results page on experiments page [SCI-5470]	2021-02-15 10:26:26 +01:00
Urban Rotnik	8c80484445	Merge pull request #3155 from urbanrotnik/ur-sci-5471 ... Fix dots, checkbox and duplicate button visibility on Experiment cards [SCI-5471]	2021-02-15 10:24:25 +01:00
Urban Rotnik	1ae0b42c2c	Fix Dots and Checkbox visibility on experiment cards	2021-02-12 13:25:12 +01:00
Mojca Lorber	b600f22248	Add no results page on experiment page	2021-02-12 12:12:26 +01:00
aignatov-bio	8191306411	Fix experiment archive page route [SCI-5479]	2021-02-12 09:55:26 +01:00
Urban Rotnik	b831d5fa14	Fix duplicate button permissions	2021-02-12 07:12:26 +01:00
aignatov-bio	41cdc47702	Merge pull request #3151 from urbanrotnik/ur-sci-5475-move-experiment-bug ... Fix Move button on Experiment card [SCI-5475]	2021-02-11 21:14:47 +01:00
Urban Rotnik	4cd2bce83f	Fix Move button on Experiment card	2021-02-11 18:38:23 +01:00
Mojca Lorber	7071f4a6c5	Send selected folders param to modal	2021-02-11 18:27:16 +01:00
aignatov-bio	1eff3494fb	Fix archived experiments page routes and clean old archive page [SCI-5479]	2021-02-11 14:21:15 +01:00
aignatov-bio	1a3c715d72	Merge pull request #3149 from aignatov-bio/ai-sci-5468-connect-details-modal-to-more-button ... Add action to more button [SCI-5468]	2021-02-11 13:56:54 +01:00
aignatov-bio	f6422a50ac	Add action to more button	2021-02-11 12:41:22 +01:00
Mojca Lorber	ce451f86a8	Fix projects breadcrumbs style [SCI-5349]	2021-02-10 23:33:16 +01:00
Mojca Lorber	19733ba7d9	Refactor deleting of empty folders	2021-02-10 22:11:42 +01:00
aignatov-bio	2fad6f5f8e	Merge pull request #3146 from aignatov-bio/ai-sci-5477-fix-archived-project-routes ... Fix archived project routes and experiment archived date [SCI-5477]	2021-02-10 18:38:13 +01:00
aignatov-bio	8adbd11197	Fix archived project routes and experiment archived date [SCI-5477]	2021-02-10 15:05:53 +01:00
aignatov-bio	486dae7559	Add task counter to experiment card [SCI-5467]	2021-02-10 14:50:42 +01:00
aignatov-bio	8853d297ed	Merge pull request #3143 from urbanrotnik/ur-sci-5455-search-results-breadcrumbs ... Add breadcrumbs to GlobalSearch results [SCI-5455]	2021-02-09 21:44:54 +01:00
aignatov-bio	9d3d1f8eac	Connect toolbar actions to buttons [SCI-5465]	2021-02-09 15:47:15 +01:00
Urban Rotnik	367ade2e32	Add breadcrumbs to GlobalSearch results	2021-02-09 13:07:40 +01:00
mlorb	45da42b924	Merge branch 'develop' into ml-sci-5311	2021-02-07 19:20:09 +01:00
aignatov-bio	a339d821bd	Merge pull request #3105 from aignatov-bio/ai-sci-5255-update-marvin-js-model-styling ... Update marvinJS modal CSS [SCI-5255]	2021-02-05 15:36:14 +01:00
aignatov-bio	2972fac96e	Merge pull request #3140 from aignatov-bio/ai-sci-5407-add-folders-link-to-search ... Add folder links to global search [SCI-5407]	2021-02-05 15:24:23 +01:00
aignatov-bio	7c99eaed8f	Add folder links to global search [SCI-5407]	2021-02-05 12:39:26 +01:00
Mojca Lorber	ad61e59593	Change the title Projects to folder/subfolder title [SCI-5456]	2021-02-05 11:04:58 +01:00
Miha Mencin	be6796c95a	Merge pull request #3137 from aignatov-bio/ai-sci-5365-add-experiments-list-view ... Add list view for experiments [SCI-5365]	2021-02-05 09:58:52 +01:00
Miha Mencin	b35e15fdd5	Merge pull request #3101 from aignatov-bio/ai-sci-5263-add-new-file-icons-to-report ... Add new asset icons to report [SCI-5263]	2021-02-05 08:21:05 +01:00
aignatov-bio	a843aac769	Add list view for experiments [SCI-5365]	2021-02-04 16:45:31 +01:00
Oleksii Kriuchykhin	c62c464902	Implement editing options and modals for experiment card [SCI-5367]	2021-02-04 12:06:51 +01:00
Alex Kriuchykhin	1466ae114f	Merge pull request #3027 from okriuchykhin/ok_SCI_5246 ... Remove Demo project and Samples inventory [SCI-5246][SCI-5248]	2021-02-04 11:28:09 +01:00
Oleksii Kriuchykhin	8a0a0cbacc	Add view only project users modal for project card [SCI-5337]	2021-02-04 11:25:35 +01:00
aignatov-bio	b4a6644f13	Merge pull request #3133 from aignatov-bio/ai-sci-5457-update-experiments-view-screen ... Connect front-end with back-end for experiments page [SCI-5457]	2021-02-04 11:00:17 +01:00
Mojca Lorber	d897e20426	Implement new experiment card layout	2021-02-04 09:02:23 +01:00
aignatov-bio	a7a948abaf	Add archive/restore toolbar buttons and backend [SCI-5457]	2021-02-03 14:29:50 +01:00
aignatov-bio	7726eae4da	Add experiments page load logic and connect filters [SCI-5457]	2021-02-03 14:29:50 +01:00
Oleksii Kriuchykhin	6b2a94f045	Add empty repositories index page [SCI-5248]	2021-02-01 15:02:08 +01:00
Mojca Lorber	9ca89ce9d9	Fix rendering error	2021-02-01 13:16:21 +01:00
aignatov-bio	8be9d3b14c	Merge pull request #3126 from biosistemika/features/new-experiments-page ... Features/new experiments page	2021-01-29 13:28:11 +01:00
aignatov-bio	29cf9be1f6	Add filters to experiments pages [SCI-5366] (#3119) ... * Move filters to shared folder [SCI-5366]	2021-01-29 13:24:02 +01:00
Mojca Lorber	1080c22b30	Update Experiments page layout and the toolbar row	2021-01-28 22:47:08 +01:00
Alex Kriuchykhin	24d3ce3606	Merge pull request #3118 from okriuchykhin/ok_SCI_5369 ... Add breadcrumbs to project experiments page [SCI-5369]	2021-01-28 14:50:21 +01:00
Oleksii Kriuchykhin	b872c6fd14	Add breadrumbs to project experiments page [SCI-5369]	2021-01-25 16:06:48 +01:00
aignatov-bio	8396c086f5	Add sticky toolbar for projects page [SCI-5401] (#3108) ... * Add sticky toolbar for projects page [SCI-5401]	2021-01-25 15:36:23 +01:00
aignatov-bio	cea61a6bd2	Add hover effect to project table [SCI-5372] (#3111) ... * Add hover effect to projects table [SCI-5372] * Fix markup [SCI-5372]	2021-01-25 10:26:10 +01:00
Urban Rotnik	7232983d59	Hide checkbox on task card if task is in experiment archived branch ... SCI-5410	2021-01-22 09:47:00 +01:00
Mojca Lorber	c58d5734ad	Implement the option of deleting empty folders [SCI-5311]	2021-01-21 19:42:25 +01:00
Alex Kriuchykhin	adb9442677	Small bugfixes [SCI-5432] (#3107)	2021-01-21 11:24:25 +01:00
aignatov-bio	908678fcff	Update marvinJS modal css [SCI-5255]	2021-01-20 12:37:41 +01:00
Urban Rotnik	33b68b8aa7	Fix permissions for result deletion	2021-01-20 09:00:45 +01:00
Urban Rotnik	7cbea1facd	Fix card Restore/Archive actions (#3103)	2021-01-19 17:21:22 +01:00
Alex Kriuchykhin	8ab7b94443	Fix error message at login with false credential [SCI-5412] (#3102)	2021-01-19 17:19:40 +01:00
aignatov-bio	07831c0294	Add new asset icons to report [SCI-5263]	2021-01-19 12:53:49 +01:00
Alex Kriuchykhin	f15d984d47	Fix navigation between archived and active projects [SCI-5419] (#3100) ... * Fix navigation between archived and active projects [SCI-5419]	2021-01-19 11:28:59 +01:00
aignatov-bio	bba1165c7b	Fix edit button for folder in archive mode [SCI-5418] (#3096) ... * Fix edit button for folder in archive mode [SCI-5418] * Remove archive folder from routes [SCI-5418]	2021-01-19 11:22:53 +01:00
Alex Kriuchykhin	64c0875b09	Merge pull request #3091 from aignatov-bio/ai-sci-5392-fixed-archived-experiment-dropdown-options_2 ... Fix archived experiment dropdown and archived view for projects page [SCI-5392]	2021-01-18 10:32:27 +01:00
Urban Rotnik	496c106497	Merge pull request #3088 from urbanrotnik/ur-sci-5395-breadcrumbs-order	2021-01-15 17:04:31 +01:00
aignatov-bio	6011bb36b6	Fix archived experiment dropdown and archived view for projects page [SCI-5392]	2021-01-15 15:08:27 +01:00
Urban Rotnik	dca0e5f188	Merge pull request #3090 from urbanrotnik/ur-sci-5405-missing-move-button ... Add data attribute for moveable permissions [SCI-5405]	2021-01-15 14:23:27 +01:00
Urban Rotnik	97371f8216	Reorder ProjectFolder inner foldres	2021-01-15 14:22:48 +01:00
Urban Rotnik	998d66b8b9	Add data attribute for moveable permissions ... SCI-5405	2021-01-15 13:54:18 +01:00
Urban Rotnik	2fa54d7898	Merge pull request #3087 from urbanrotnik/ur-sci-5397-folder-link-in-activities ... Fix folder's activities links [SCI-5397]	2021-01-15 13:52:55 +01:00
Alex Kriuchykhin	902a47490d	Merge pull request #3082 from okriuchykhin/ok_SCI_5383_v2 ... Show folder creation button on archived page [SCI-5383]	2021-01-15 11:38:58 +01:00
aignatov-bio	adb9084787	Fix comments red dot and ordering of comments [SCI-5384] (#3084) ... * Fix comments red dot and ordering of comments [SCI-5384]	2021-01-14 16:28:11 +01:00
aignatov-bio	823b9175bd	Small projects pages fixes [SCI-5330] (#3085)	2021-01-14 16:24:28 +01:00
Urban Rotnik	531b6cd554	Fix folder's activities links	2021-01-14 15:06:56 +01:00
Oleksii Kriuchykhin	8d3a605571	Fix projects index page JS initialization [SCI-5380]	2021-01-14 13:08:29 +01:00
Oleksii Kriuchykhin	ec7d1bf813	Show folder creation button on arhived page [SCI-5383]	2021-01-13 15:26:02 +01:00
Urban Rotnik	1c5337e6ab	Fix for move_modal partial rendering	2021-01-12 15:45:21 +01:00
Alex Kriuchykhin	62b1aaf033	Merge pull request #3077 from okriuchykhin/ok_SCI_5386 ... Fix flash messages on sign-in [SCI-5386]	2021-01-12 15:44:24 +01:00
Urban Rotnik	91ea82a21d	Merge pull request #3062 from urbanrotnik/ur-sci-5362-missing-archived-on-date ... Add fallback archived_on and archived_by for MyModule and Experiment [SCI-5362]	2021-01-12 15:36:51 +01:00
Urban Rotnik	1070e813fc	Add helper for archived_on date	2021-01-12 15:35:35 +01:00
Oleksii Kriuchykhin	cf3b0916f6	Fix flash messages on sign-in [SCI-5386]	2021-01-12 15:28:30 +01:00
Mojca Lorber	0b9daaa7d5	Change button style again	2021-01-12 14:37:22 +01:00
Alex Kriuchykhin	5f506b7459	Merge pull request #3072 from okriuchykhin/ok_SCI_5383 ... Fix folder creation for archived view [SCI-5383]	2021-01-12 13:50:20 +01:00
Oleksii Kriuchykhin	78ec862a2c	Fix folder creation for archived view [SCI-5383]	2021-01-12 13:06:43 +01:00
aignatov-bio	8533e54adb	Add permission check for open manage user modal and experiment actions dropdown [SCI-5382] (#3073)	2021-01-12 12:16:33 +01:00
mlorb	8fbdfa28d5	Merge pull request #3070 from mlorb/ml-sci-5333 ... Add no results page for search on project page [SCI-5333]	2021-01-12 12:02:37 +01:00
aignatov-bio	8099c4ed4c	Fix error on task page without due date [SCI-5375] (#3066)	2021-01-12 11:11:40 +01:00
Alex Kriuchykhin	04f68facd3	Merge pull request #3064 from okriuchykhin/ok_SCI_5344 ... Add Restore button to the archived Projects screen [SCI-5344]	2021-01-12 10:59:39 +01:00
Mojca Lorber	54a5528495	Add no results page for serach on project page [SCI-5333]	2021-01-12 09:18:19 +01:00
aignatov-bio	e88848cd75	Fix comments counter [SCI-5371] (#3063)	2021-01-11 10:03:13 +01:00
Oleksii Kriuchykhin	684674952c	Add Restore button to the archived Projects screen [SCI-5344]	2021-01-09 21:27:19 +01:00
Urban Rotnik	427b5d7107	Merge pull request #3059 from biosistemika/features/folders ... Features/folders into develop	2021-01-08 06:26:44 +01:00
Urban Rotnik	6f155913ff	Merge pull request #3056 from urbanrotnik/ur-sci-5334-move-project-folders-feature ... Move projects/folders modal [SCI-5334]	2021-01-07 17:45:19 +01:00
Urban Rotnik	5d79eaa843	Pass projects mode(archived/active) to move_to modal for list [SCI-5334]	2021-01-07 17:42:05 +01:00
Urban Rotnik	3a52f62d85	Implement folders tree for move action	2021-01-07 17:42:01 +01:00
aignatov-bio	276d6abe19	Update archive navigation for tasks page [SCI-5347] (#3052) ... * Update archive navigation for tasks page [SCI-5347]	2021-01-07 17:18:52 +01:00
aignatov-bio	0d7da90b15	Small fixes for projects folder cards [SCI-5345] (#3049)	2021-01-07 17:02:25 +01:00
aignatov-bio	5aae35d700	Update archived experiments navigation (#3053)	2021-01-07 14:58:56 +01:00
Alex Kriuchykhin	962b3a532e	Merge pull request #3057 from okriuchykhin/ok_SCI_5317 ... Add project permissions check to projects toolbar [SCI-5317]	2021-01-07 13:25:34 +01:00
aignatov-bio	1f6fff812a	Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331] (#3048) ... * Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331]	2021-01-07 13:16:05 +01:00
Oleksii Kriuchykhin	9882539213	Add project permissions check to projects toolbar [SCI-5317]	2021-01-06 22:23:48 +01:00
mlorb	ca955b27a8	Merge pull request #3051 from mlorb/ml-sci-5335 ... Change buttons style in projects toolbar [SCI-5335]	2021-01-06 15:09:33 +01:00
Oleksii Kriuchykhin	53be6a95c4	Fix projects filter mark, titles and comments mark [SCI-5332]	2021-01-06 11:28:39 +01:00
Mojca Lorber	96e387d06d	Change buttons style in projects toolbar [SCI-5335]	2021-01-06 11:13:28 +01:00
aignatov-bio	ef57489cd9	Update repositories sidebar [SCI-5329] (#3031) ... * Update repositories sidebar [SCI-5329]	2021-01-06 10:13:10 +01:00
Urban Rotnik	8f11376285	Merge pull request #3045 from urbanrotnik/ur-sci-5320-tooptip-for-avatars ... Tooltip for users on project cards [SCI-5320]	2021-01-06 09:18:00 +01:00
Mojca Lorber	283bfc8759	Update css for users on project cards	2021-01-05 18:31:33 +01:00
Oleksii Kriuchykhin	c83327b720	Fix project buttons visibility [SCI-5318]	2021-01-05 14:29:20 +01:00
Oleksii Kriuchykhin	696b8d19f0	Fix new project creation and archiving [SCI-5321][SCI-5326]	2021-01-05 14:14:01 +01:00
Alex Kriuchykhin	a8991356b5	Merge pull request #3033 from okriuchykhin/ok_SCI_5341 ... Fix restore action for experiments and tasks [SCI-5341]	2021-01-05 10:09:39 +01:00
aignatov-bio	2fe55250b9	Update settings navigation [SCI-5316] (#3028)	2021-01-05 09:11:05 +01:00
Oleksii Kriuchykhin	58cce0f153	Improve task restoring and refactor flash messages [SCI-5341]	2021-01-04 17:00:23 +01:00
Urban Rotnik	cd43973952	Add tooltips for users on project cards	2021-01-04 16:44:31 +01:00
Alex Kriuchykhin	163a2d1e60	Merge pull request #3042 from okriuchykhin/ok_SCI_5340 ... Make active projects view default [SCI-5340]	2021-01-04 11:56:22 +01:00
Alex Kriuchykhin	e0e796c5e7	Merge pull request #3040 from okriuchykhin/ok_SCI_5328 ... Fix project card menu visibility [SCI-5328]	2021-01-04 11:55:54 +01:00
Urban Rotnik	a53bfbdd33	Merge pull request #3014 from urbanrotnik/ur-sci-5283-smart-annotation-archived-link ... Add 'archived' to smart annotation for repository item [SCI-5283]	2021-01-04 11:53:47 +01:00
Alex Kriuchykhin	4638e74e1e	Merge pull request #3041 from okriuchykhin/ok_SCI_5327 ... Fix links in sidebar navigation [SCI-5327]	2021-01-04 10:53:38 +01:00
Oleksii Kriuchykhin	ffd9132b52	Make active projects view default [SCI-5340]	2020-12-31 16:00:26 +01:00
Oleksii Kriuchykhin	8f0a3fb61c	Fix links in sidebar navigation [SCI-5327]	2020-12-30 22:49:02 +01:00
Oleksii Kriuchykhin	49dc56caf2	Fix project card menu visibility [SCI-5328]	2020-12-30 22:17:04 +01:00
Oleksii Kriuchykhin	f76eb170a1	Fix restore action for experiments and tasks [SCI-5341]	2020-12-28 22:21:38 +01:00
Mojca Lorber	62af5cc723	[SCI-5287] Show step collapse/expand on task	2020-12-22 15:50:27 +01:00
aignatov-bio	b3faa170fb	PDF preview to file preview and inline view [SCI-5299][SCI-5298] (#3018) ... * Add PDF Preview [SCI-5299]	2020-12-22 15:25:30 +01:00
Mojca Lorber	21c0ea4f8d	[SCI-5293] Remove Archived results tab on archived Task	2020-12-21 11:56:33 +01:00
Oleksii Kriuchykhin	67b3f853d7	Merge branch 'develop' into features/folders	2020-12-18 14:51:21 +01:00
mlorb	a999fb0c80	Change the layout of the archived projects cards and the list view [SCI-5267] (#3021) ... * change the layout of the archived projects cards and the list view * change order in css	2020-12-18 13:05:23 +01:00
Urban Rotnik	7c0ad021de	Update sorting dropdown	2020-12-18 11:08:38 +01:00
Urban Rotnik	63a41b123d	Fix dropdown JS bug, fix folders_search, apply all new filters to search ... SCI-5306	2020-12-18 09:43:11 +01:00
Urban Rotnik	87ca79717c	Add separate sorting for active/archived view ... [SCI-5306]	2020-12-18 08:41:51 +01:00
mlorb	f6f7211d77	Update styling for projects filters and fix some js bugs [SCI-5210] (#3012) ... * Update styling for projects filters and fix some js bugs * Fix hound	2020-12-17 23:13:45 +01:00
Urban Rotnik	ad4ee65f6b	Merge pull request #3007 from urbanrotnik/ur-sci-5300 ... Connect manage users modal with new projects cards [SCI-5300]	2020-12-17 13:48:10 +01:00
Miha Mencin	f284ef1592	Merge pull request #3009 from okriuchykhin/ok_SCI_5276 ... Archiving: update archived TASK screen layout [SCI-5276]	2020-12-17 13:46:35 +01:00
Oleksii Kriuchykhin	7bb334e737	Archiving: update archived TASK screen layout [SCI-5276]	2020-12-17 13:26:44 +01:00
Urban Rotnik	3eb667b6ba	Merge pull request #3005 from urbanrotnik/ur-sci-5274-archived-task-cards ... Archived tasks cards [SCI-5274] [SCI-5275]	2020-12-17 13:17:11 +01:00
Urban Rotnik	19f16555c6	Add checkbox and restore button ... [SCI-5275]	2020-12-17 13:11:20 +01:00
Urban Rotnik	9a7ffb0645	Add Tags modal to archived tags screen ... [SCI-5274]	2020-12-17 13:08:57 +01:00
Urban Rotnik	2ae075e893	Use canvas task card for archived task card ... [SCI-5274]	2020-12-17 13:08:53 +01:00
aignatov-bio	2ca7b81cea	Update archived view for experiments [SCI-5270][[SCI-5271][SCI-5277] (#3011) ... * Change experiment archived card [SCI-5270]	2020-12-17 13:07:30 +01:00
Miha Mencin	ba3db65437	Merge pull request #3008 from okriuchykhin/ok_SCI_5273 ... Remove the 'Archived tasks' tab and refactor sidebar to include archived [SCI-5273]	2020-12-17 09:44:40 +01:00
Miha Mencin	ea9f3dcada	Merge pull request #2996 from okriuchykhin/ok_SCI_5253 ... Implement the 'seen comments' functionality (red dot) for the comments [SCI-5253]	2020-12-17 09:17:44 +01:00
Urban Rotnik	a4fd69c292	Add 'archived' to smart annotation for repository item	2020-12-15 07:36:49 +01:00
aignatov-bio	30cfe78805	Add edit modal for project folders [SCI-5265] (#3002) ... Add edit modal for project folders [SCI-5265]	2020-12-14 15:54:18 +01:00
Oleksii Kriuchykhin	94b6c96e48	Remove the 'Archived tasks' tab and refactor sidebar to include archived [SCI-5273]	2020-12-12 22:46:30 +01:00
Urban Rotnik	398978c69a	Connect users modal to projects index page	2020-12-11 13:07:45 +01:00
Mojca Lorber	5cdab422df	Update layout of the navigation for experiments, tasks list and task page	2020-12-10 15:15:36 +01:00
Urban Rotnik	207659a2c1	Fix markup [SCI-5266]	2020-12-10 13:36:38 +01:00
Urban Rotnik	152990b4d6	Add archived mode for Projects ... [SCI-5266]	2020-12-09 08:51:55 +01:00
aignatov-bio	6a44e23697	Add projects sidebar [SCI-5178] (#2995) ... * Add projects sidebar navigation [SCI-5178]	2020-12-08 16:07:26 +01:00
aignatov-bio	188013dd56	Change permission for sorting in steps and asset view [SCI-5289]	2020-12-08 10:45:43 +01:00
Oleksii Kriuchykhin	62374bee0a	Implement the 'seen comments' functionality (red dot) for the comments [SCI-5253]	2020-12-07 11:04:33 +01:00
aignatov-bio	568fcb20df	Fix protocol revert from repository [SCI-5285]	2020-12-04 12:07:25 +01:00
Urban Rotnik	7773afbcdb	Add activities for Project Folders [SCI-5181]	2020-12-04 12:03:49 +01:00
Alex Kriuchykhin	7a4f60f25e	Merge pull request #2989 from mlorb/ml-sci-5240 ... [SCI-5240] Implement Create new folder function	2020-12-04 09:57:05 +01:00
mlorb	9693f84bbd	Implement actions dropdown on project card [SCI-5132] [SCI-5179] (#2968) ... * Implement actions dropdown on project card * make comments counter to work	2020-12-04 09:38:34 +01:00
aignatov-bio	edd774b045	Merge pull request #2992 from aignatov-bio/ai-sci-fix-asset-link-partial-in-item-card ... Fix asset link partial in item card	2020-12-03 13:19:30 +01:00
aignatov-bio	e6e9c84a7c	Fix asset link partial in item card	2020-12-03 12:58:54 +01:00
Mojca Lorber	9253cf5ade	Change javascript for modal handeling and some other small fixes	2020-12-03 12:53:19 +01:00
mlorb	74f0f0474a	Merge branch 'features/folders' into ml-sci-5240	2020-12-03 12:50:19 +01:00
Urban Rotnik	478d43f9ce	Merge pull request #2987 from urbanrotnik/ur-sci-5208 ... Projects cards and list view with filters [SCI-5208]	2020-12-03 12:30:37 +01:00
Urban Rotnik	3700faa04a	Update proejcts grid, include breadcrumbs, fix JS ... [SCI-5208]	2020-12-03 12:29:28 +01:00
aignatov-bio	c43851a2f4	Fix download links in reports [SCI-5279]	2020-12-03 12:16:48 +01:00
Oleksii Kriuchykhin	dc15accc86	Update sidebar usages in partials [SCI-5177]	2020-12-03 10:21:53 +01:00
Oleksii Kriuchykhin	9546b8f71d	Prepare backend for the improved navigation [SCI-5177]	2020-12-03 10:19:11 +01:00
Mojca Lorber	d7e3b57d0d	[SCI-5240] Implement Create new folder function	2020-12-01 09:59:08 +01:00
aignatov-bio	48184df312	Merge pull request #2985 from aignatov-bio/ai-sci-5250-add-preview-to-export-all ... Add preview files to export all [SCI-5250]	2020-11-30 12:21:43 +01:00
Oleksii Kriuchykhin	78e050ccc0	Add clickable breadcrumbs above the folder names on the Team Project page [SCI-5171]	2020-11-27 14:27:24 +01:00
Urban Rotnik	fcb82fd0d2	Merge pull request #2984 from okriuchykhin/ok_SCI_5204 ... Project filters: add text field to the filters [SCI-5204]	2020-11-27 12:04:46 +01:00
aignatov-bio	8cdf09f244	Add preview files to export all	2020-11-27 11:07:37 +01:00
Oleksii Kriuchykhin	1553d32c6e	Project filters: add text field to the filters [SCI-5204]	2020-11-26 21:29:45 +01:00
aignatov-bio	d162fb6d35	Merge pull request #2980 from aignatov-bio/ai-sci-5241-add-confirmation-for-file-delete ... Add delete asset confirmation modal [SCI-5241]	2020-11-26 15:35:40 +01:00
aignatov-bio	c6f4d23a78	Fix protocol preview file background	2020-11-26 15:35:06 +01:00
aignatov-bio	fbc7822bfe	Add ability to close modal by esc	2020-11-26 14:51:10 +01:00
Urban Rotnik	efd4f8abde	Add members dropdown on project filters flyout	2020-11-26 12:29:43 +01:00
Alex Kriuchykhin	5a1f169846	Merge pull request #2978 from urbanrotnik/ur-sci-5244-folders-projects-sorting ... Project and folders sorting [SCI-5244]	2020-11-26 11:42:29 +01:00
Urban Rotnik	34fbcb8f56	Add clear functionallity to projects filters	2020-11-26 09:23:22 +01:00
Urban Rotnik	afc6d12b49	Project and folders sorting	2020-11-25 18:34:39 +01:00
aignatov-bio	3078e60867	Small css fixes	2020-11-25 16:25:17 +01:00
aignatov-bio	c212d514d5	Fix delete asset in protocol repository	2020-11-25 13:13:06 +01:00
aignatov-bio	1979883004	Add delete asset confirmation modal	2020-11-25 12:50:34 +01:00
Oleksii Kriuchykhin	0de237cece	Implement project search with grouping by folder [SCI-5207]	2020-11-25 11:59:02 +01:00
Mojca Lorber	81798a96ad	Add new SciNote avatars	2020-11-25 10:43:59 +01:00
mlorb	e4001dd406	Merge pull request #2977 from mlorb/ml-sci-5048 ... Implement ESC button to exit full-screen modals [SCI-5048]	2020-11-25 09:55:16 +01:00
Mojca Lorber	2a8c98b7ec	Implement ESC button to exit full-screen modals	2020-11-24 23:20:53 +01:00
aignatov-bio	f2ca55dbf8	Add new icons for assets	2020-11-24 15:37:45 +01:00
aignatov-bio	dc62e2780a	Merge pull request #2963 from aignatov-bio/ai-sci-5186-add-new-comments-layout ... Add comments sidebar layout [SCI-5186][SCI-5188][SCI-5189]	2020-11-24 11:25:36 +01:00
Alex Kriuchykhin	1380d5873d	Merge pull request #2946 from okriuchykhin/ok_SCI_5136 ... Implement search endpoint for Projects & folders search [SCI-5136]	2020-11-23 13:09:33 +01:00
Mojca Lorber	c57da3380f	Remove complete step button from protocol step and fix step number in Firefox	2020-11-23 10:18:27 +01:00
aignatov-bio	77b7b1b231	Add errors handling and i18n	2020-11-21 12:31:49 +01:00
aignatov-bio	60ce51149d	Add CRUD to comments	2020-11-20 20:25:28 +01:00
aignatov-bio	da4b8aaf2f	Add comments list	2020-11-20 12:29:40 +01:00
Oleksii Kriuchykhin	86e5078622	Add project folders to global search [SCI-5180]	2020-11-20 11:10:03 +01:00
Alex Kriuchykhin	f5860397f5	Merge pull request #2953 from okriuchykhin/ok_SCI_5183 ... Make folders selectable for 'Export all' functionality [SCI-5183]	2020-11-20 09:54:53 +01:00
aignatov-bio	bc5221d4a7	Merge pull request #2959 from aignatov-bio/ai-sci-5225-fix-links-in-report ... Add scinote link to PDF reports [SCI-5225]	2020-11-19 12:20:32 +01:00
aignatov-bio	483ff8f1f2	Merge pull request #2964 from biosistemika/features/office-file-previews ... Features/office file previews merge branch	2020-11-19 11:11:39 +01:00
Urban Rotnik	e893d40eea	Add filters flyout for projects	2020-11-19 09:23:35 +01:00
aignatov-bio	2294d396f9	Add comments sidebar layout	2020-11-18 16:26:01 +01:00
aignatov-bio	6bb4af1d95	Merge pull request #2961 from aignatov-bio/ai-sci-5231-fix-protocol-import-from-protocol-io ... Fix protocol import from protocol.io [SCI-5231]	2020-11-18 10:06:06 +01:00
aignatov-bio	3a2b36369a	Fix protocol import from protocol.io	2020-11-18 09:57:50 +01:00
aignatov-bio	2947426b44	Add scinote link to pdf reports	2020-11-17 13:54:13 +01:00
Oleksii Kriuchykhin	6dfeae2283	Make folders selectable for 'Export all' functionality [SCI-5183]	2020-11-13 14:39:10 +01:00
aignatov-bio	6c305011ca	Update dashboard placeholders	2020-11-12 12:49:00 +01:00
aignatov-bio	7fd7c2de6a	Add download link to reports	2020-11-11 15:48:00 +01:00
mlorb	a71e8ef9cf	Merge pull request #2940 from mlorb/ml-sci-5034 ... Expose the new step button on task [SCI-5034]	2020-11-10 13:10:55 +01:00
Oleksii Kriuchykhin	ee1bcd7aac	Implement search endpoint for Projects & folders search [SCI-5136]	2020-11-09 16:16:09 +01:00
Urban Rotnik	0f5bf45cf6	Rebase, add toolbar, minor fixes css and JS	2020-11-06 13:56:21 +01:00
Urban Rotnik	9f12c5f343	New cards and list layout	2020-11-06 13:01:52 +01:00
Alex Kriuchykhin	b51e92d5be	Merge pull request #2933 from okriuchykhin/ok_SCI_5047 ... Add browser notification for unsaved data when navigating away for tables on Task [SCI-5047]	2020-11-06 09:06:37 +01:00
Mojca Lorber	8ee8f7b4d2	Expose the new step button on task	2020-11-05 16:14:40 +01:00
Urban Rotnik	2c347af7bf	Add data attribute to change status dropdown	2020-11-05 13:19:45 +01:00
aignatov-bio	d29a62dad1	Improve markup	2020-11-05 10:41:06 +01:00
aignatov-bio	8145a292fd	Clear code and add missed I18n translation	2020-11-05 10:03:15 +01:00
aignatov-bio	99b52e5d80	Fix markup	2020-11-05 08:44:48 +01:00
Oleksii Kriuchykhin	327baafcd7	Improve CSS structure for project toolbar [SCI-5129]	2020-11-04 16:10:40 +01:00
aignatov-bio	12fdea8d89	Add context menu to attahcments	2020-11-04 13:08:40 +01:00
aignatov-bio	e8e9244d96	Fix I18n and double loading	2020-11-03 09:07:49 +01:00
Oleksii Kriuchykhin	8eec4e4b59	Add browser notification for unsaved data when navigating away for tables on Task [SCI-5047]	2020-11-02 22:19:33 +01:00
aignatov-bio	0f80786433	Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into ai-sci-5101-add-attachments-dropdown-to-step	2020-11-02 18:52:46 +01:00
aignatov-bio	f85a3493cd	Merge pull request #2925 from aignatov-bio/ai-sci-5110-add-file-previews-to-reports ... Add filer previews to reports [SCI-5110]	2020-11-02 18:48:45 +01:00
aignatov-bio	eca39a00b5	Add attachments dropdown to step	2020-11-02 18:47:08 +01:00
Mojca Lorber	8aed48d1ae	Merge branch 'develop' into features/office-file-previews	2020-11-02 13:45:06 +01:00
Oleksii Kriuchykhin	258c57870f	Implement the toolbar on the Team Projects page [SCI-5129]	2020-11-02 13:28:37 +01:00
Mojca Lorber	04e3b67968	Change the way buttons are toggled	2020-10-30 18:47:01 +01:00
Urban Rotnik	042231469c	Fix syntax	2020-10-30 13:37:59 +01:00
Mojca Lorber	a52315fc79	Merge branch 'develop' into ml-sci-5033	2020-10-29 18:28:25 +01:00
aignatov-bio	12991e8fd3	Commit add asset preview mode switcher to step	2020-10-29 16:42:05 +01:00
Urban Rotnik	e923128c0e	Merge pull request #2927 from biosistemika/features/signature-requests ... Features/signature requests into develop	2020-10-29 14:48:25 +01:00
aignatov-bio	b0fe68553a	Fix tests	2020-10-29 14:30:26 +01:00
aignatov-bio	131d487e69	Add file preview to list view	2020-10-29 14:30:26 +01:00
aignatov-bio	d99e279ecc	Add gallery to file preview	2020-10-29 14:30:26 +01:00
aignatov-bio	c56f7912ef	Update file preview	2020-10-29 14:23:32 +01:00
Oleksii Kriuchykhin	13fcfedf41	Refactor experiment workflow image generation [SCI-5063]	2020-10-29 13:16:09 +01:00
aignatov-bio	23f9fb212d	Merge pull request #2915 from aignatov-bio/ai-sci-5105-update-image-edit-modal ... Update image edit modal [SCI-5105]	2020-10-29 09:15:32 +01:00
aignatov-bio	2f1217688c	Add filer previews to reports	2020-10-28 16:32:22 +01:00
Miha Mencin	235f87e0d9	Merge pull request #2924 from biosistemika/release/1.20.2 ... Release/1.20.2	2020-10-28 13:58:25 +01:00
aignatov-bio	bb983af42f	Merge pull request #2911 from aignatov-bio/ai-sci-4579-update-checkbox-style ... Update checkbox style at repository and protocol datatable [SCI-4579]	2020-10-27 10:22:56 +01:00
Urban Rotnik	cb9db57645	Merge pull request #2909 from urbanrotnik/ur-sci-5006 ... Add lock icon to current task section on dashboard [SCI-5006]	2020-10-27 08:20:55 +01:00
Urban Rotnik	b94a3a6cb8	Clean up controller	2020-10-26 16:17:39 +01:00
aignatov-bio	6edcf4b099	Add size label	2020-10-26 15:10:06 +01:00
Urban Rotnik	1ffc3449bf	Clean up index view	2020-10-26 13:42:32 +01:00
Urban Rotnik	431b9161b6	Code cleanup	2020-10-26 11:03:43 +01:00
Mojca Lorber	ec41bdd414	Move open mobile app button to main navigation	2020-10-26 09:28:44 +01:00
aignatov-bio	aefaf4d0c1	Update image edit modal	2020-10-25 16:57:50 +01:00
aignatov-bio	d6f8e156c1	Update checkbox style at repository and protocol datatable	2020-10-22 16:42:12 +02:00
Urban Rotnik	aa1520bfb8	Merge branch 'develop' into jg_sci_2228	2020-10-22 14:21:39 +02:00
Mojca Lorber	2639810e1a	Fix no step bug	2020-10-22 13:21:05 +02:00
Urban Rotnik	58013e215d	Add lock icon to current task section on dashboard	2020-10-22 08:09:51 +02:00
Mojca Lorber	6d7b55301f	Fix pwa url and change when banner is displayed	2020-10-21 14:56:20 +02:00
Mojca Lorber	23f01ac6a9	Add 'Open in APP' button to the task	2020-10-19 12:17:03 +02:00
aignatov-bio	566ef7aef7	Add list view to atachments	2020-10-16 11:00:57 +02:00
aignatov-bio	016fc8a632	Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into features/office-file-previews	2020-10-15 15:25:54 +02:00
aignatov-bio	0a4b89cf39	Merge branch 'develop' into features/office-file-previews	2020-10-15 15:19:56 +02:00
Mojca Lorber	cf367baefa	Merge branch 'develop' into ml-sci-4841	2020-10-12 14:43:03 +02:00
aignatov-bio	5d6c9e78fd	Refactor dashboard layout	2020-10-06 16:09:26 +02:00
Miha Mencin	3a4a166856	Merge pull request #2888 from okriuchykhin/ok_SCI_5082 ... Fix index page for users without a team [SCI-5082]	2020-10-05 10:16:04 +02:00
Oleksii Kriuchykhin	dd64206b25	Fix index page for users without a team [SCI-5082]	2020-10-02 16:57:46 +02:00
Mojca Lorber	4e4a4a2c4e	Change Complete step button on task step	2020-10-02 15:02:42 +02:00
Oleksii Kriuchykhin	6c367428a1	Fix team switcher [SCI-5080]	2020-10-02 14:25:44 +02:00
Oleksii Kriuchykhin	21fab4198c	Merge branch 'develop' into features/local	2020-10-01 11:52:59 +02:00
aignatov-bio	d21aee1843	Remove complete step button from protocol managment	2020-09-29 15:08:01 +02:00
Oleksii Kriuchykhin	25a9f5c685	Add typeface-lato for shipping Lato fonts	2020-09-28 18:02:47 +02:00
aignatov-bio	1ed65eddfa	Move ordering to front-end	2020-09-25 15:06:09 +02:00
Alex Kriuchykhin	fb28fa557b	Merge pull request #2872 from okriuchykhin/ok_SCI_5062 ... Improve performance of fetching of statuses [SCI-5062]	2020-09-25 15:00:30 +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
Oleksii Kriuchykhin	134e549ed5	Improve performance of fetching of statuses [SCI-5062]	2020-09-25 10:14:57 +02:00
Mojca Lorber	94fea75fda	Fix at long inventory name snapshot in title is not visible	2020-09-24 17:19:41 +02:00
aignatov-bio	70a0da17b2	Fix markup	2020-09-24 17:12:53 +02:00
aignatov-bio	780db9d134	Add assets view switcher	2020-09-24 17:10:36 +02:00
Urban Rotnik	7bc31905b5	Fix protocol import modal	2020-09-23 12:54:16 +02:00
aignatov-bio	e4b94b582a	Add dynamic render of wopi files in viewport	2020-09-23 12:32:46 +02:00
Oleksii Kriuchykhin	2cda80dc5f	Add Endpoins for Project Membership manipulation [SCI-5001]	2020-09-23 11:03:29 +02:00
mlorb	feda5622d8	Merge pull request #2860 from mlorb/ml-sci-5007 ... Add info of the locked task to the View status flow modal [SCI-5007]	2020-09-23 10:19:48 +02:00
Mojca Lorber	affae15ccf	Simplification	2020-09-22 17:19:15 +02:00
mlorb	547af538b3	Merge pull request #2856 from mlorb/ml-sci-5009 ... Update empty states for smart annotation results and dismiss button [SCI-5009]	2020-09-22 15:31:22 +02:00
Mojca Lorber	fe779f9146	Add info of the locked task to the View status flow modal	2020-09-22 10:21:55 +02:00
aignatov-bio	f8a28f378e	Add shared inventories to smart annotation	2020-09-21 14:36:34 +02:00
Mojca Lorber	d9a78d20d7	Update empty states for smart annotation results and dismiss button	2020-09-18 08:50:01 +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
aignatov-bio	f11f54db33	Small fixes	2020-09-17 13:11:54 +02:00
aignatov-bio	86667feb6b	Add remembered state for smart annotation	2020-09-17 11:43:07 +02:00
mlorb	4acd0c4cb9	Merge pull request #2841 from mlorb/ml-sci-4984 ... Add saving state for filters on dashboard [SCI-4984]	2020-09-17 09:53:16 +02:00
aignatov-bio	c26f8e7193	Add before send condition for status change	2020-09-16 15:23:53 +02:00
Mojca Lorber	9cd8e3b7ac	Change default status values, add project and experiment to saved state and fix parsing error handeling	2020-09-16 09:48:06 +02:00
aignatov-bio	14acf2b624	Add i18n	2020-09-15 14:47:57 +02:00
Mojca Lorber	3c30ee904e	Merge branch 'features/task-flows' into ml-sci-4984	2020-09-15 13:27:34 +02:00
mlorb	bf707a11a9	Merge branch 'features/task-flows' into ml-sci-4976	2020-09-15 12:59:49 +02:00
aignatov-bio	6dc4422d82	Fix markup	2020-09-15 11:56:44 +02:00
Mojca Lorber	fe7d922cc5	Refactor complete step button	2020-09-15 11:18:15 +02:00
Mojca Lorber	13f719a9e1	Add saving state for filters on dashboard	2020-09-14 18:15:57 +02:00
aignatov-bio	c10e2d231e	Update frontend permission check	2020-09-14 15:59:09 +02:00
Oleksii Kriuchykhin	a7c6ab9d89	Move some consequence executon into background process [SCI-4978]	2020-09-11 16:18:39 +02:00
aignatov-bio	008563a7f4	Update user smart annotation	2020-09-11 13:00:13 +02:00
aignatov-bio	5a063f070d	Clone module before condition validation	2020-09-10 16:53:07 +02:00
aignatov-bio	18426b90be	Disable button when condition not fullfield	2020-09-10 13:40:52 +02:00
mlorb	3d2aaed791	Merge pull request #2820 from mlorb/ml-sci-4580 ... Fix buttons visability on reports page according to new styleguide [SCI-4580]	2020-09-10 09:32:16 +02:00
Urban Rotnik	78c9394b1f	Fix aligment due date and status on canvas card	2020-09-09 14:33:25 +02:00
Mojca Lorber	eeb8f4a97a	Disable 'complete step' button on locked task	2020-09-09 14:32:37 +02:00
aignatov-bio	7a86bb47c5	Add styling and highligh	2020-09-09 14:17:19 +02:00
aignatov-bio	946b961b1a	Merge pull request #2819 from aignatov-bio/ai-sci-4975-add-permission-checks-for-statuses ... Add front-end checks for statuses [SCI-4975]	2020-09-09 13:21:04 +02:00
aignatov-bio	661220890f	Update error handling	2020-09-09 12:25:34 +02:00
aignatov-bio	f4a13a73cb	Refactor smart annotation front-end	2020-09-09 12:25:34 +02:00
aignatov-bio	5d9d7d6a12	Merge pull request #2829 from aignatov-bio/ai-sci-4983-add-descriptions-for-conditions ... Add description for conditions [SCI-4983]	2020-09-09 11:33:48 +02:00
Urban Rotnik	9419a16df5	Merge pull request #2833 from urbanrotnik/ur-sci-4988-notes-duplication ... Remove notes duplication [SCI-4988]	2020-09-09 11:29:10 +02:00
aignatov-bio	7763d11634	Fix markup	2020-09-09 11:24:54 +02:00
Urban Rotnik	9066586149	Fix duedate for PDF and DOCX	2020-09-09 10:48:42 +02:00
aignatov-bio	84682c6346	Merge pull request #2823 from mlorb/ml-sci-4575 ... Replace old arrow with new one [SCI-4575]	2020-09-09 09:05:39 +02:00
aignatov-bio	9a771da7f7	Merge pull request #2821 from mlorb/ml-sci-4578 ... Fix buttons visability on protocols page according to new styleguide [SCI-4578]	2020-09-09 09:05:26 +02:00
aignatov-bio	ae1bec2a95	Merge pull request #2818 from mlorb/ml-sci-4572 ... Change step checklist and table edit mode [SCI-4572]	2020-09-09 09:02:56 +02:00
aignatov-bio	bdb3caf5cf	Add i18n	2020-09-09 08:50:24 +02:00
aignatov-bio	687093e110	Merge pull request #2817 from aignatov-bio/ai-sci-4972-fix-complete-state-for-tasks ... Add completed/uncompleted methods to my_module [SCI-4972]	2020-09-09 08:20:36 +02:00
Alex Kriuchykhin	7eb43a16d5	Merge pull request #2806 from okriuchykhin/ok_SCI_4859 ... Add secondary-navigation-title-name data hook [SCI-4859]	2020-09-08 16:19:42 +02:00
Urban Rotnik	c628fb2598	Remove duplicated notes section in reports	2020-09-08 16:10:24 +02:00
aignatov-bio	bd1d6a772b	Add completed/uncompleted methods to my_module	2020-09-08 09:45:09 +02:00
aignatov-bio	492d25f9b3	Add description for conditions	2020-09-07 15:12:09 +02:00
Oleksii Kriuchykhin	3150a36a64	Fix canvas edit mode [SCI-4880]	2020-09-07 14:54:49 +02:00
Oleksii Kriuchykhin	ea845040aa	Fix missing step edit button [SCI-4880]	2020-09-07 13:49:11 +02:00
Oleksii Kriuchykhin	dea75553a3	Fix handling of duplicated step positions [SCI-4880]	2020-09-07 10:44:00 +02:00
Mojca Lorber	9dac4079f8	Replace old arrow with new one and remove redundant javascript for arrow collapsing	2020-09-04 14:43:30 +02:00
Mojca Lorber	24745203e1	Fix buttons visability on protocols page according to new styleguide	2020-09-03 17:05:25 +02:00
Mojca Lorber	1f0d9f3ad7	Fix buttons visability on reports page according to new styleguide	2020-09-03 16:19:02 +02:00
aignatov-bio	d85703113a	Add front-end checks	2020-09-03 14:34:34 +02:00
Mojca Lorber	06d75fb07e	Change step checklist and table edit mode	2020-09-02 18:04:37 +02:00
aignatov-bio	257329ce80	Fix css for status flows	2020-09-02 15:41:07 +02:00
Urban Rotnik	447ba6aa64	Merge pull request #2812 from urbanrotnik/ur-sci-4969-status-on-task-card ... Show status on task card [SCI-4969]	2020-09-01 15:28:48 +02:00
Urban Rotnik	ed5869ff8e	Show status on task card	2020-09-01 14:56:48 +02:00
Urban Rotnik	5148902d93	Fix error on edit experiment	2020-09-01 13:37:57 +02:00
Urban Rotnik	a259800590	Merge branch 'develop' into jg_sci_2228	2020-08-31 16:29:23 +02:00
Urban Rotnik	4eebfa5461	Controller action for card inline preview	2020-08-28 11:05:52 +02:00
Oleksii Kriuchykhin	bc4c18e585	Add secondary-navigation-title-name data hook [SCI-4859]	2020-08-27 11:33:26 +02:00
Oleksii Kriuchykhin	a206890a8c	Fix step position adjusting on move and destroy [SCI-4880]	2020-08-25 15:46:21 +02:00
Urban Rotnik	5923a4c014	Merge branch 'develop' into features/task-flows	2020-08-25 15:30:22 +02:00
aignatov-bio	c3ddfd5bed	Merge pull request #2786 from aignatov-bio/ai-sci-4899-add-new-statuses-filters-on-dashboard ... Fix dropdrown selector [SCI-4899]	2020-08-25 14:51:55 +02:00
Alex Kriuchykhin	5006173d59	Merge pull request #2780 from aignatov-bio/ai-sci-4856-add-new-statuses-to-dashboard ... Add new statuses to dashboard [SCI-4856]	2020-08-24 11:09:57 +02:00
Alex Kriuchykhin	121644decf	Merge pull request #2770 from okriuchykhin/ok_SCI_4881 ... Create new activities for exporting assigned items (live & snapshots) [SCI-4881]	2020-08-21 11:01:49 +02:00
Alex Kriuchykhin	ccf4e2a747	Merge pull request #2759 from okriuchykhin/ok_SCI_4817 ... Refactor task archive and move permissions [SCI-4817]	2020-08-21 11:01:05 +02:00
Mojca Lorber	faf2d4c533	Fix export icon	2020-08-14 17:02:03 +02:00
Mojca Lorber	a91aa6ce46	Fix Collapse and expand buttons position	2020-08-13 13:18:50 +02:00
aignatov-bio	9474319d6b	Fir error handling in invite user view	2020-08-13 11:34:21 +02:00
aignatov-bio	5360db76be	Fix dropdrown selector	2020-08-12 14:00:10 +02:00
aignatov-bio	91b8475db5	Merge pull request #2784 from aignatov-bio/ai-sci-4918-display-all-errors-on-signup ... Fix error handling on registration page [SCI-4918]	2020-08-12 09:39:21 +02:00
aignatov-bio	84b99eaf3d	Fix error handling on registration page	2020-08-11 15:39:35 +02:00
aignatov-bio	56ff4e7702	Add new statuses to dashboard	2020-08-10 09:10:56 +02:00
Urban Rotnik	3c3a2bfb8b	Add check if user is locked, show link unlock instructions	2020-08-06 15:18:20 +02:00
Oleksii Kriuchykhin	ce8d12e1c4	Create new activities for exporting assigned items (live & snapshots) [SCI-4881]	2020-08-05 09:59:58 +02:00
Urban Rotnik	073979534c	Merge branch 'features/task-flows' into develop_to_task_flows	2020-08-04 16:43:05 +02:00
Urban Rotnik	e221d960e7	Revert "Merge pull request #2767 from aignatov-bio/ai-sci-4899-add-new-statuses-filters-on-dashboard" ... This reverts commit 8b6d57058c, reversing changes made to 957ac92669.	2020-08-04 15:07:22 +02:00
Urban Rotnik	7c14da70d9	Merge branch 'features/task-flows' into develop_to_task_flows	2020-08-04 14:50:46 +02:00
Urban Rotnik	6853caa0c8	Merge pull request #2760 from aignatov-bio/ai-sci-4894-small-2fa-fixes ... Small 2fa fixes [SCI-4894]	2020-08-04 11:23:08 +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	e965844a9e	Merge pull request #2755 from aignatov-bio/ai-sci-4837-implement-new-statuses-in-preports ... Add new statuses to reports [SCI-4837]	2020-08-04 09:49:55 +02:00
Alex Kriuchykhin	a9bc5b664a	Merge pull request #2750 from aignatov-bio/ai-sci-4835-add-status-flow-modal ... Add modal for status flow [SCI-4835]	2020-08-04 09:47:40 +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	536367362c	Add statuses to dashboard filters	2020-07-31 10:59:10 +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
aignatov-bio	f09ead703c	Fix markup	2020-07-28 09:54:47 +02:00
aignatov-bio	b644950e4e	Fix I18n markup	2020-07-28 09:53:35 +02:00
aignatov-bio	68fc6ec58a	Add sorting my module statuses	2020-07-27 16:36:21 +02:00
aignatov-bio	968249c6d8	Fix tests	2020-07-27 13:48:21 +02:00
aignatov-bio	9f7efe6068	Add backend for status flow show	2020-07-27 13:48:21 +02:00
aignatov-bio	6bd12e0397	Add modal for status flow	2020-07-27 13:48:21 +02:00
aignatov-bio	33e3e3d301	Small 2fa fixes	2020-07-27 13:42:51 +02:00
Oleksii Kriuchykhin	94588e4698	Refactor task archive and move permissions [SCI-4817]	2020-07-24 17:00:42 +02:00
Urban Rotnik	025378cd0e	Fix translations and JS	2020-07-23 15:53:46 +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	a0d19b5d98	Add new statuses to reports	2020-07-23 14:24:30 +02:00
Urban Rotnik	512d6f3229	Add actions for update status, clean old complete actions	2020-07-22 16:12:34 +02:00
Urban Rotnik	aacee14fc6	Add Status button	2020-07-22 15:30:47 +02:00
aignatov-bio	1d3055011f	Merge branch 'features/tinymce-tables' into develop	2020-07-22 13:41:43 +02:00
aignatov-bio	53d62b0310	Fix tests	2020-07-22 13:16:27 +02:00
aignatov-bio	ddfe8231d8	Merge branch 'features/2fa' into develop	2020-07-22 11:56:36 +02:00
Alex Kriuchykhin	c13730ee8d	Merge pull request #2740 from mlorb/ml-sci-4833 ... Implement Status labels on a Task card [SCI-4823]	2020-07-22 11:32:45 +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	e69e3ea8d3	Add export for assigned items	2020-07-17 15:17:09 +02:00
Mojca Lorber	10e607c281	Implement Status labels on a Task card	2020-07-17 14:48:45 +02:00
aignatov-bio	7c4bfad09b	Add pagination to results page	2020-07-16 15:47:19 +02:00
aignatov-bio	f77902f6d4	Add tinymce table support to docx	2020-07-15 09:44:25 +02:00
aignatov-bio	39b5651283	Revert FontAwesome in reports to CDN	2020-07-14 09:44:03 +02:00
Alex Kriuchykhin	8dd478ad61	Merge pull request #2730 from aignatov-bio/ai-sci-4874-improve-pdf-reports ... Improve pdf reports [SCI-4874]	2020-07-13 17:02:10 +02:00
aignatov-bio	c592954400	Add UX	2020-07-13 16:05:23 +02:00
Mojca Lorber	212ba76c16	Fix Settings pages titles	2020-07-13 14:51:51 +02:00
aignatov-bio	f8c6d9f260	Fix markup	2020-07-13 14:31:57 +02:00
aignatov-bio	a7fac38fcb	Improve pdf reports	2020-07-13 14:29:59 +02:00
aignatov-bio	7d20bf6fea	Add recovery screen	2020-07-13 09:51:04 +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	4003608c7d	Fix style	2020-07-09 15:43:08 +02:00
Urban Rotnik	d2415c3b1d	Show assigned users modal also for view	2020-07-09 15:11:53 +02:00
mlorb	3f44f44cbe	Merge pull request #2711 from mlorb/ml-sci-4810 ... Hide inventory buttons and fix css of disabled button [SCI-4810]	2020-07-09 15:11:02 +02:00
Urban Rotnik	b11f166c38	Fix cucumber tests	2020-07-09 13:14:07 +02:00
Urban Rotnik	d92bcee3f6	Helpers for first elements	2020-07-09 13:14:06 +02:00
Miha Mencin	b357d7c0e6	Merge pull request #2719 from urbanrotnik/ur-sci-4806-missing-icon ... Add icon before archived items [SCI-4806]	2020-07-09 12:58:06 +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	d9038e6f7f	Merge branch 'develop' into ml-sci-4810	2020-07-09 11:46:54 +02:00
Urban Rotnik	7661cea379	Add icon before archived items	2020-07-09 11:34:09 +02:00
Miha Mencin	c68aa5c875	Merge pull request #2716 from mlorb/ml-sci-4567 ... Change title size to h1 [SCI-4567]	2020-07-09 11:19:02 +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	f64172f787	Revert repository archived items title	2020-07-09 09:17:02 +02:00
aignatov-bio	b2a42c182b	Merge pull request #2717 from aignatov-bio/ai-sci-4844-fix-dropdown-options-for-active-repository ... Small archived repositories fixes [SCI-4844]	2020-07-09 08:56:21 +02:00
aignatov-bio	135ac487d0	Small archived repositories fixes	2020-07-08 13:42:27 +02:00
Mojca Lorber	00b668a4ba	Change title size to h1	2020-07-08 13:02:47 +02:00
Urban Rotnik	5d067077b1	Add logo and timestamp to PDF and Doc reports	2020-07-08 10:48:29 +02:00
aignatov-bio	a994c75885	Merge pull request #2700 from aignatov-bio/ai-sci-4801-inventory-list-sorting-date-issue ... Fix date columns sorting in repositories list [SCI-4801]	2020-07-08 09:30:10 +02:00
aignatov-bio	004a7e3943	Merge pull request #2705 from aignatov-bio/ai-sci-4808-update-css-for-inventory-modals ... Update inventory modals CSS [SCI-4808]	2020-07-08 09:29:02 +02:00
aignatov-bio	88c092dc98	Add i18n and constants	2020-07-07 15:59:02 +02:00