Commit graph

1609 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
1aa334fdaa Merge branch 'develop' into release-1-17-8 2019-12-11 10:55:00 +01:00
Oleksii Kriuchykhin
03667f619f Merge branch 'release-1-17-7' into develop 2019-12-05 13:03:39 +01:00
aignatov-bio
d5f9604e1c Fix file post process method 2019-12-03 10:17:47 +01:00
Alex Kriuchykhin
fbf1a5b6e2
Merge pull request #2239 from okriuchykhin/ok_SCI_4098
Refactor Azure configuration  and connected accounts [SCI-4098]
2019-11-29 11:30:33 +01:00
Oleksii Kriuchykhin
6c7f45fc20 Add simplified view for sign-in form [SCI-4098] 2019-11-28 17:00:43 +01:00
Miha Mencin
13191f1a72
Merge pull request #2223 from biosistemika/SCI-4058-disable-inventory-delition-for-normal-user
Sci 4058 disable inventory delition for normal user
2019-11-28 14:31:32 +01:00
Oleksii Kriuchykhin
f5abb7c767 Add connected accounts section to settings [SCI-4106] 2019-11-27 23:16:25 +01:00
aignatov-bio
68284c10da Add task description and task protocol description activities 2019-11-27 14:37:53 +01:00
Oleksii Kriuchykhin
6b20a10473 Refactor Azure configuration [SCI-4098] 2019-11-26 15:09:40 +01:00
Alex Kriuchykhin
111056a032
Merge pull request #2224 from okriuchykhin/ok_SCI_4112
Fix adding experiment contents to report [SCI-4112]
2019-11-26 09:50:28 +01:00
Miha Mencin
a328c4ad56 fix CR comments 2019-11-25 17:40:29 +01:00
aignatov-bio
d732b2f1a6
Merge pull request #2228 from aignatov-bio/ai-sci-4090-fix-task-tags
Add strict order to module tags in modal [SCI-4090]
2019-11-25 13:55:33 +01:00
Miha Mencin
e65e344c39 fix styling 2019-11-25 10:45:21 +01:00
aignatov-bio
5100ab4d08 Add strict order to module tags in modal 2019-11-25 10:15:06 +01:00
Miha Mencin
bd34435b39 fixing style issues 2019-11-25 08:44:33 +01:00
aignatov-bio
7fa753ca81 Fix name update and path to team 2019-11-23 23:20:38 +01:00
Oleksii Kriuchykhin
8f94c85b7a Fix adding experimaent contents to report [SCI-4112] 2019-11-22 14:57:59 +01:00
Miha Mencin
1bf6663196 check the permissions in before action 2019-11-22 13:23:02 +01:00
aignatov-bio
2e30f50ae8
Merge pull request #2221 from aignatov-bio/ai-sci-3976-add-autosave-other-fields
Add autosave for protocol keywords, user preferences and due date [SCI-3976]
2019-11-21 13:13:10 +01:00
aignatov-bio
0b04ca4012 Fix markup 2019-11-21 12:19:47 +01:00
Miha Mencin
04a6645cfc Separate view/edit/modify permissions SCI-4058 2019-11-20 17:12:47 +01:00
aignatov-bio
56ae32323c Add autosave for protocol keywords and user preferences 2019-11-20 14:57:53 +01:00
Oleksii Kriuchykhin
46ee43ea8b Improve handling of file links for local storage [SCI-4071] 2019-11-19 15:35:31 +01:00
aignatov-bio
264493a322 Finish removing Select2 library 2019-11-18 13:59:55 +01:00
aignatov-bio
e7ad7ae969 New tags drop down 2019-11-18 13:59:55 +01:00
Anton Ignatov
17e457c686 Finished global activities refactoring 2019-11-18 13:59:54 +01:00
Anton Ignatov
fc70ce24f8 Refactor side filters for global activities 2019-11-18 13:59:54 +01:00
Anton Ignatov
7b855f54ac Finish main part of selectors 2019-11-18 13:59:54 +01:00
Urban Rotnik
5e97116c5a Update results params 2019-11-18 11:11:39 +01:00
Urban Rotnik
8b5e346770 Remove file deletion manually 2019-11-18 11:11:39 +01:00
Urban Rotnik
cc9d987321 Add update result(file) and create result(file) API endpoint 2019-11-18 11:11:38 +01:00
Urban Rotnik
060125a1c4 Add file size validation 2019-11-18 11:11:38 +01:00
Urban Rotnik
1be88baab1 Add API endpoint for Attachments resource 2019-11-18 11:11:38 +01:00
Urban Rotnik
e7083e188c Add API endpoint for Step resource
[SCI-3835]
2019-11-18 11:11:37 +01:00
Urban Rotnik
24033bec7a Add API endpoint for Task creation 2019-11-18 11:11:37 +01:00
aignatov-bio
3eb6f5695b
Merge pull request #2207 from aignatov-bio/mlorb-ml-sci-4004
Add auto-save feature to text fields [SCI-4004]
2019-11-18 09:11:10 +01:00
aignatov-bio
1488f75e26 Add activities 2019-11-13 13:57:04 +01:00
aignatov-bio
a9690482d1 Add autosave feature to text fields 2019-11-12 11:26:18 +01:00
Oleksii Kriuchykhin
b646295698 Fix service_url for local storage [SCI-4057] 2019-11-06 15:21:56 +01:00
Oleksii Kriuchykhin
ab691efdb2 Fix LinkedIn sign-up [SCI-4047] 2019-10-29 16:20:19 +01:00
Alex Kriuchykhin
5524598d53
Merge pull request #2172 from biosistemika/release_1_17_3
Merge release 1.17.3 to master
2019-10-22 12:45:02 +02:00
Oleksii Kriuchykhin
53402c9ce1 Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993] 2019-10-17 13:30:14 +02:00
Oleksii Kriuchykhin
f3a6c18a84 Improve permission checking for reports [SCI-3991] 2019-10-14 14:50:05 +02:00
aignatov-bio
54627faeb3 Fix tests 2019-10-11 11:46:51 +02:00
aignatov-bio
521a367960 Add predefined avatars 2019-10-11 11:46:51 +02:00
Alex Kriuchykhin
f6da6814b8
Merge pull request #2154 from okriuchykhin/ok_SCI_3977
Generate previews for newly created office files once asset is saved [SCI-3977]
2019-10-10 15:43:02 +02:00
Oleksii Kriuchykhin
07b037f05b Generate previews for newly created office files once asset is saved [SCI-3977] 2019-10-10 15:40:50 +02:00
Alex Kriuchykhin
48171f7e02
Merge pull request #2153 from okriuchykhin/ok_SCI_3977
Fix previews for newly created office files [SCI-3977]
2019-10-10 15:11:24 +02:00
Oleksii Kriuchykhin
0b4f72e517 Fix previews for newly created office files [SCI-3977] 2019-10-10 14:25:19 +02:00
aignatov-bio
9d59d56818 Generate all preview for assets at same time 2019-10-10 14:17:02 +02:00