Commit graph

6991 commits

Author SHA1 Message Date
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
Urban Rotnik
fa6b1fa0db JS fixes 2019-12-20 15:19:30 +01:00
Urban Rotnik
181d637ff3 Update/refactor JS for handling Dates and Times 2019-12-20 14:59:27 +01:00
Urban Rotnik
f3bc6386c3 Fix partials renderer 2019-12-20 14:59:26 +01:00
Urban Rotnik
1531d44e6b Add DateTime validators 2019-12-20 14:59:23 +01:00
Urban Rotnik
2e88f194bc Fix tests 2019-12-20 14:58:14 +01:00
Urban Rotnik
dfe3c5292e Add TimeRange and DateRange renderer 2019-12-20 14:57:04 +01:00
Urban Rotnik
5d4453470a Add DateTimeRange renderer 2019-12-20 14:56:11 +01:00
Urban Rotnik
2a63854123 Edit and new renderers for DateTime columns 2019-12-20 14:55:11 +01:00
Urban Rotnik
7c71159303 Add Inputmask to webpack 2019-12-20 14:50:44 +01:00
Alex Kriuchykhin
3e37d286c9
Merge pull request #2274 from okriuchykhin/ok_SCI_4171
Fix creation of new tasks on canvas [SCI-4171]
2019-12-19 16:21:53 +01:00
Oleksii Kriuchykhin
7694b2ac6d Update Dockerfile [SCI-4171] 2019-12-19 15:54:06 +01:00
Oleksii Kriuchykhin
b945171f2f Fix creation of new tasks on canvas [SCI-4171] 2019-12-19 15:48:25 +01:00
Alex Kriuchykhin
0566b17d50
Merge pull request #2272 from okriuchykhin/ok_SCI_4166
Add view/edit renderers for numeric data type [SCI-4166]
2019-12-19 11:57:13 +01:00
Alex Kriuchykhin
017b4a3913
Merge pull request #2273 from biosistemika/dependabot/bundler/rack-2.0.8
Bump rack from 2.0.7 to 2.0.8
2019-12-19 11:52:43 +01:00
Oleksii Kriuchykhin
56b002452e Fix tests for inventories [SCI-4166] 2019-12-19 11:38:26 +01:00
dependabot[bot]
fd0816ec7e
Bump rack from 2.0.7 to 2.0.8
Bumps [rack](https://github.com/rack/rack) from 2.0.7 to 2.0.8.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/2.0.7...2.0.8)

Signed-off-by: dependabot[bot] <support@github.com>
2019-12-19 00:22:41 +00:00
Oleksii Kriuchykhin
ac8aa88b88 Fix RepositoryTextValueSerializer [SCI-4166] 2019-12-18 16:37:21 +01:00
Urban Rotnik
b7bc46f606
Merge pull request #2270 from urbanrotnik/ur-sci-4170-remove-delimiter-column
Move delimiter from column to metadata [SCI-4170]
2019-12-18 16:06:10 +01:00
Oleksii Kriuchykhin
24dabc312f Update Dockerfile [SCI-4166] 2019-12-18 14:57:35 +01:00
aignatov-bio
dc91893d7e Refactor checklist column data structure 2019-12-18 14:10:41 +01:00
Oleksii Kriuchykhin
e24bc2775a Add view/edit renderers for numeric data type [SCI-4166] 2019-12-18 11:55:12 +01:00
mlorb
891baba1e7
Merge pull request #2269 from mlorb/ml-sci-4093
Add new button style [SCI-4093]
2019-12-18 10:39:52 +01:00
Urban Rotnik
7153711570 Move delimiter from column to metadata 2019-12-18 10:22:52 +01:00
Mojca Lorber
46e7de0c25 Add new button style 2019-12-18 09:57:39 +01:00
Miha Mencin
8d22bf6f2e Version bump to 1.17.9 2019-12-17 14:54:48 +01:00
Miha Mencin
1cf6d35e57
Merge pull request #2268 from biosistemika/release/1.17.9
Release/1.17.9
2019-12-17 14:53:06 +01:00
Miha Mencin
b67911c81a Merge branch 'SCI-4058-disable-inventory-delition-for-normal-user' into release/1.17.9 2019-12-17 14:48:50 +01:00
Oleksii Kriuchykhin
dc8ff18d68 Fix issue with clone & move task to another experiment [SCI-4145] 2019-12-17 11:54:34 +01:00
Oleksii Kriuchykhin
403a3e0140 Restrict files to only images in RTE fields [SCI-4146] 2019-12-16 16:05:40 +01:00
aignatov-bio
2da7eeaedd
Merge pull request #2260 from aignatov-bio/ai-sci-4121-add-edit-mode-to-checklist
Add checklist and list edit mode [SCI-4121]
2019-12-13 09:23:14 +01:00
Alex Kriuchykhin
792e6f2eb9
Merge pull request #2263 from okriuchykhin/ok_SCI_4142
Implement SSO with Azure AD [SCI-4142]
2019-12-12 16:12:40 +01:00
Oleksii Kriuchykhin
0094528a02 Improve connected accounts unlinking [SCI-4142] 2019-12-12 14:57:27 +01:00
Alex Kriuchykhin
91174437ee
Merge pull request #2261 from biosistemika/dependabot/bundler/puma-4.3.1
Bump puma from 4.1.1 to 4.3.1
2019-12-12 14:10:41 +01:00
dependabot[bot]
3940f4ccf8
Bump puma from 4.1.1 to 4.3.1
Bumps [puma](https://github.com/puma/puma) from 4.1.1 to 4.3.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.1.1...v4.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
2019-12-12 12:09:51 +00:00
Alex Kriuchykhin
d8c2b70365
Merge pull request #2259 from biosistemika/release-1-17-8
Merge release 1.17.8 to develop
2019-12-12 13:08:52 +01:00
aignatov-bio
eed56b59aa Fix markup 2019-12-11 15:08:18 +01:00
aignatov-bio
52c0782447 Fix checklist update 2019-12-11 15:05:02 +01:00