6948 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
aignatov-bio	751d34a078	Merge pull request #2288 from aignatov-bio/ai-sci-4192-empty-item-field-placeholders ... Update placeholders for cells [SCI-4192]	2020-01-10 10:50:00 +01:00
Alex Kriuchykhin	f1babb2237	Merge pull request #2279 from okriuchykhin/ok_SCI_4000 ... Fix sidebar update for inline editing [SCI-4000]	2020-01-10 10:34:27 +01:00
Alex Kriuchykhin	d2e12e0683	Merge pull request #2265 from okriuchykhin/ok_SCI_4146 ... Restrict files to only images in RTE fields [SCI-4146]	2020-01-10 10:34:00 +01:00
aignatov-bio	e371715331	Merge pull request #2289 from aignatov-bio/ai-sci-4215-prevent-editing-two-items ... Prevent editing 2 items [SCI-4215]	2020-01-10 10:13:30 +01:00
Urban Rotnik	728823ed65	fixup! Fix for numeric item in SQL array	2020-01-10 09:46:25 +01:00
Oleksii Kriuchykhin	ad5a5f3ebf	Fix sorting for date time columns [SCI-4197]	2020-01-09 16:18:28 +01:00
aignatov-bio	f494a97f99	Merge pull request #2290 from aignatov-bio/ai-sci-4200-fix-error-on-opening-inventory ... Fix error on opening inventory [SCI-4200]	2020-01-09 16:00:12 +01:00
aignatov-bio	8a647ee003	Fix error on opening inventory	2020-01-09 15:32:28 +01:00
aignatov-bio	38eaf19dde	Prevent editing 2 items	2020-01-09 15:19:04 +01:00
Alex Kriuchykhin	9e58b2a759	Merge pull request #2283 from okriuchykhin/ok_SCI_4212 ... Fix repository status item deletion issue [SCI-4212]	2020-01-09 15:06:17 +01:00
Alex Kriuchykhin	9ab07af87b	Merge pull request #2282 from okriuchykhin/ok_SCI_4149 ... Disable comment edit mode if comment is not editable [SCI-4149]	2020-01-09 15:06:04 +01:00
Alex Kriuchykhin	704c89a7d6	Merge pull request #2284 from okriuchykhin/ok_SCI_4196 ... Fix repository table state updates after column creation/deletion [SCI-4196]	2020-01-09 15:05:51 +01:00
aignatov-bio	36c606c8a4	Merge pull request #2287 from aignatov-bio/ai-sci-4213-update-validation-for-repository-text-fields ... Update validation for repository text field [SCI-4213]	2020-01-09 14:58:24 +01:00
aignatov-bio	13675dd2e7	Update placeholders for cells	2020-01-09 14:57:37 +01:00
aignatov-bio	9fdea4657c	Update validation for repository text field	2020-01-09 13:32:03 +01:00
Urban Rotnik	39593b6342	Fix for numeric item in SQL array	2020-01-09 11:24:38 +01:00
Oleksii Kriuchykhin	2ec27e54f3	Fix repository status item deletion issue [SCI-4212]	2020-01-08 17:32:07 +01:00
Oleksii Kriuchykhin	2faab14444	Fix repository table state updates after column creation/deletion [SCI-4196]	2020-01-08 16:16:54 +01:00
Oleksii Kriuchykhin	1624f9d5ab	Disable comment edit mode if comment is not editable [SCI-4149]	2020-01-08 12:32:59 +01:00
aignatov-bio	54c78cf4d1	Merge pull request #2262 from aignatov-bio/ai-sci-update-global-styles ... Update colors and buttons	2020-01-08 12:30:51 +01:00
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