6978 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
aignatov-bio	5953c2543d	Fix typo and boostrap load order	2020-01-08 12:07:33 +01:00
Oleksii Kriuchykhin	522ae12f08	Merge branch 'develop' into ok_SCI_3988	2020-01-07 17:07:22 +01:00
Alex Kriuchykhin	f5004a1ba0	Merge pull request #2281 from biosistemika/features/new-column-types ... Merge features/new-column-types to develop	2020-01-07 16:30:48 +01:00
aignatov-bio	68646276f5	Replace bootstrap styles for button	2020-01-07 16:13:34 +01:00
Oleksii Kriuchykhin	d9b9243da7	Merge branch 'develop' into features/new-column-types	2020-01-07 16:03:33 +01:00
Alex Kriuchykhin	1e665804ab	Merge pull request #2280 from aignatov-bio/ai-sci-4155-add-new-invetories-to-team-export ... Add new column types to team export/import [SCI-4155]	2020-01-07 15:47:09 +01:00
Alex Kriuchykhin	1de5e0a47b	Merge pull request #2264 from aignatov-bio/ai-sci-4157-add-new-columns-support-for-report ... Add helper for repository tables in docx report [SCI-4157]	2020-01-07 15:33:12 +01:00
Oleksii Kriuchykhin	fb9493a11c	Fix tests [SCI-3988]	2020-01-07 15:30:30 +01:00
Oleksii Kriuchykhin	1b902ff4b3	Merge branch 'develop' into ok_SCI_3988	2020-01-07 15:26:30 +01:00
Oleksii Kriuchykhin	4df8779b19	Fix experiment template exporter [SCI-3988]	2020-01-07 15:26:21 +01:00
aignatov-bio	a69e587706	Change cells loading in report repository helper	2020-01-07 14:21:55 +01:00
aignatov-bio	10b7aad732	Add ned column types to team export/import	2020-01-07 14:12:48 +01:00
Oleksii Kriuchykhin	3e82b1ae89	Fix migrations [SCI-3988]	2020-01-07 13:43:32 +01:00
Urban Rotnik	cedaaa7ee2	Merge pull request #2278 from urbanrotnik/ur-sci-4161-global-search-for-new-column-types ... Add search for statuses, numbers [SCI-4161]	2020-01-07 11:46:11 +01:00
Alex Kriuchykhin	71cb4bf6f6	Merge pull request #2266 from okriuchykhin/ok_SCI_4145 ... Fix issue with clone & move task to another experiment [SCI-4145]	2020-01-06 17:02:27 +01:00
Oleksii Kriuchykhin	16b591b110	Fix sidebar update for inline editing [SCI-4000]	2020-01-06 16:07:23 +01:00
aignatov-bio	c3c070c11a	Update checklist formatted value	2020-01-06 13:03:05 +01:00
aignatov-bio	83f8df2012	Rebase branch and fix checklist formatted	2020-01-06 12:40:09 +01:00
aignatov-bio	4895f41238	Add helper for repository tables in docx report	2020-01-06 12:40:09 +01:00
aignatov-bio	f717ce66cb	Fix tests	2020-01-06 12:31:56 +01:00
aignatov-bio	464d03558a	Fix markup, replace buttons and add new logo	2020-01-06 10:40:20 +01:00
aignatov-bio	e714787c38	Fix markup	2020-01-06 10:40:20 +01:00
aignatov-bio	18a8be43f5	Add new logo	2020-01-06 10:40:20 +01:00
aignatov-bio	d93095b489	Fix markup	2020-01-06 10:40:20 +01:00
aignatov-bio	a281f09e7f	Add reports and missed modals	2020-01-06 10:40:20 +01:00
aignatov-bio	ef3814ccec	Add new buttons to protocols, tasks, experiments, projects	2020-01-06 10:40:20 +01:00
aignatov-bio	aba3baf685	Fix colors	2020-01-06 10:40:20 +01:00
aignatov-bio	3f38b1e6a1	Add text input fields	2020-01-06 10:40:20 +01:00
aignatov-bio	443ab8645f	Add toggles	2020-01-06 10:40:20 +01:00
aignatov-bio	7bfefd8659	Add checkboxes and radio buttons	2020-01-06 10:40:20 +01:00
aignatov-bio	9694117635	Add new colors and buttons	2020-01-06 10:40:20 +01:00
Urban Rotnik	c15bcf0769	Add search support for numeric	2020-01-06 10:12:11 +01:00
Urban Rotnik	87288d0771	Add search for statuses	2020-01-06 10:12:08 +01:00
aignatov-bio	3bd44dc5ab	Merge pull request #2271 from aignatov-bio/ai-sci-4168-refactor-checklist-model ... Refactor checklist column data structure [SCI-4168]	2019-12-24 11:12:36 +01:00
Urban Rotnik	4e39547ae8	Merge pull request #2277 from urbanrotnik/ur-sci-4183-refactor-statuses-for-new-dropdown ... Refactor statuses for new dropdown [SCI-4183]	2019-12-24 08:14:17 +01:00
Urban Rotnik	356ba6572d	Fix naming	2019-12-24 08:13:30 +01:00
aignatov-bio	210292de07	Leave string_agg only for checklists	2019-12-23 21:36:56 +01:00
Oleksii Kriuchykhin	c79b25d5d2	Fix compatibility issues of SASSC in production Docker images	2019-12-23 17:24:56 +01:00
Urban Rotnik	c286334c1d	UpdateRepositoryRowService fix	2019-12-23 14:53:51 +01:00
Urban Rotnik	7116034b34	Update new renderer for StatusList	2019-12-23 14:40:15 +01:00
Urban Rotnik	400c109592	Refactor StatusesJS for new dropdown	2019-12-23 14:34:11 +01:00
aignatov-bio	725bb449d5	Fix naming	2019-12-23 09:20:36 +01:00
Miha Mencin	882ec711fe	Merge pull request #2276 from biosistemika/master ... Master	2019-12-20 17:39:46 +01:00
Miha Mencin	9df967fdc1	Merge pull request #2275 from biosistemika/hotfix/1.17.10 ... Hotfix/1.17.10	2019-12-20 17:38:52 +01:00
Miha Mencin	ea4dbbb97d	Bump version to 1.17.10	2019-12-20 17:37:49 +01:00
Urban Rotnik	8929b9f51e	Merge pull request #2267 from urbanrotnik/ur-sci-4082-date-time-edit-renderers ... DateTime renderers[SCI-4082]	2019-12-20 16:39:06 +01:00
Urban Rotnik	79b7d63116	JS fix	2019-12-20 16:14:39 +01:00
Urban Rotnik	0ff3039368	Update Hound Rubocop	2019-12-20 15:59:31 +01:00
aignatov-bio	54800cb69b	Merge branch 'features/new-column-types' into ai-sci-4168-refactor-checklist-model	2019-12-20 15:46:39 +01:00
aignatov-bio	16c4879e56	Merge migrations and update sorting	2019-12-20 15:42:54 +01:00