Commit graph

5050 commits

Author SHA1 Message Date
Jure Grabnar
7812f70c2f
Merge pull request #1393 from jbargu/jg_2790_protocolsio_fix
Protocols - import from protocols.io doesn't work
2018-11-26 14:56:25 +01:00
mlorb
18d9ab5888 fixes upon @Ducz0r request 2018-11-26 14:23:26 +01:00
Oleksii Kriuchykhin
2e00f1546a Fix handsontable initialization [SCI-2882] 2018-11-26 14:11:46 +01:00
Jure Grabnar
6ec2c99a28 Hound styling 2018-11-26 13:52:01 +01:00
Jure Grabnar
0086e4dcf3 Catch some of templates error when import protocols.io 2018-11-26 13:43:05 +01:00
Luka Murn
eb2bf184b2
Merge pull request #1394 from Ducz0r/lm-sci-2884-fix
Update export email's look & feel [SCI-2884]
2018-11-26 11:50:31 +01:00
Jure Grabnar
c7d108ec16 Update according to Hound
Closes [SCI-2790]
2018-11-23 20:52:07 +01:00
Jure Grabnar
1c7a051551 Catch all errors on PIO import and show message 2018-11-23 20:47:48 +01:00
Jure Grabnar
2834edb286 Add command/subprotocol/safety for PIO 2018-11-23 20:13:34 +01:00
Jure Grabnar
c00b08b101 Add sw_package and dataset component for PIO 2018-11-23 19:44:10 +01:00
Jure Grabnar
5ab2556632 Importing of protocols now works 2018-11-23 18:54:37 +01:00
Jure Grabnar
2c8a7f8eca Add last_modified evaluation for PIO import 2018-11-23 17:51:47 +01:00
Jure Grabnar
87d5e5029a Fix publish_date in PIO import 2018-11-23 17:37:26 +01:00
Luka Murn
87ff7c71e3 Update the delivery email look & feel
Closes SCI-2884.
2018-11-23 17:24:10 +01:00
Jure Grabnar
76c2da4bae Add uniq tables 2018-11-23 16:30:29 +01:00
mlorb
4052fad9e0 fix hound 2018-11-23 15:51:18 +01:00
mlorb
f61187dd18 Hide sign-in with third party applications (e.g. LinkedIn) in Oauth flows 2018-11-23 15:44:04 +01:00
Oleksii Kriuchykhin
b926cadba4 Fix smartannotations rendering issues [SCI-2880] 2018-11-23 15:07:08 +01:00
Luka Murn
4903cdadc4
Merge pull request #1389 from Ducz0r/lm-sci-2883
Remove byebug from HTML template [SCI-2883]
2018-11-23 14:02:49 +01:00
Luka Murn
af307eae73 Move some text into localization file 2018-11-23 11:12:10 +01:00
Luka Murn
d071454fc8 Remove byebug from HTML template
Closes SCI-2883.
2018-11-23 10:31:41 +01:00
Alex Kriuchykhin
95e19e1229
Merge pull request #1381 from okriuchykhin/ok_SCI_2859
Refactor & restyle the API authorization screen [SCI-2859]
2018-11-22 13:06:13 +01:00
mlorb
de803e70a8
Merge pull request #1385 from mlorb/ml-sci-2866
Fix in app help window does not close in some cases [SCI-2866]
2018-11-22 10:48:52 +01:00
mlorb
4ace5bf49f
Merge pull request #1384 from mlorb/ml-sci-2846
Fix teams switch not working at navigating from task [SCI-2846]
2018-11-22 10:48:33 +01:00
Alex Kriuchykhin
f811afc7e2
Merge pull request #1387 from okriuchykhin/ok_SCI_2877
Fix comments form for new results [SCI-2877]
2018-11-22 10:28:09 +01:00
Alex Kriuchykhin
1a5868baf2
Merge pull request #1386 from okriuchykhin/ok_SCI_2875
Fix task tags modal [SCI-2875]
2018-11-22 10:27:40 +01:00
Oleksii Kriuchykhin
6cd033767c Fix comments form for new results [SCI-2877] 2018-11-21 23:48:43 +01:00
Oleksii Kriuchykhin
df938a8ba5 Fix task tags modal [SCI-2875] 2018-11-21 22:24:12 +01:00
Alex Kriuchykhin
afe5db5cf3
Merge pull request #1382 from okriuchykhin/ok_SCI_2872
Change text color on project cards tabs [SCI-2872]
2018-11-21 10:59:03 +01:00
mlorb
39b01bc8ed fix in app help window does not close in some cases 2018-11-21 10:19:41 +01:00
mlorb
8bf1056bf5 fix teams switch not working at navigating from task 2018-11-21 10:12:21 +01:00
Luka Murn
5d61a93659
Merge pull request #1383 from biosistemika/release-1-14-3-hotfix-1
Merge release-1.14.3-hotfix-1 into master
2018-11-21 08:10:58 +01:00
Alex Kriuchykhin
c3ef391641
Merge pull request #1380 from okriuchykhin/ok_SCI_2869
Prevent user being added to project/task multiple times [SCI-2869]
2018-11-20 22:38:38 +01:00
mz3944
6b996fc000
Merge pull request #1362 from mz3944/mz-SCI-2817
Export - various small changes/fixes [SCI-2817]
2018-11-20 21:32:47 +01:00
mz3944
4d460d14ea
Merge pull request #1378 from mz3944/mz-SCI-2861
All users in smart annotation have removed in brackets [SCI-2861]
2018-11-20 21:22:23 +01:00
mz3944
a9eb2fc249
Merge pull request #1377 from mz3944/mz-SCI-2863
Fix DataTable display for protocol modal [SCI-2863]
2018-11-20 21:21:29 +01:00
Oleksii Kriuchykhin
59fb971394 Change text color on project cards tabs [SCI-2872] 2018-11-20 17:31:27 +01:00
Oleksii Kriuchykhin
d98f11abdc Refactor & restyle the API authorization screen [SCI-2859] 2018-11-20 17:02:45 +01:00
Oleksii Kriuchykhin
5deaf25fd9 Prevent user being added to project/task multiple times [SCI-2869] 2018-11-20 14:29:33 +01:00
Alex Kriuchykhin
a6bc02a2cb
Merge pull request #1369 from okriuchykhin/ok_SCI_2830
Refactor result and step comments [SCI-2830]
2018-11-20 00:13:15 +01:00
Jure Grabnar
13bc664902
Merge pull request #1367 from jbargu/jg_2746_health_unit_tests
Add unit tests for status/health API endpoints
2018-11-19 13:14:38 +01:00
Oleksii Kriuchykhin
b7ccfccfe0 Imrove tags update behaviour on canvas [SCI-2830] 2018-11-19 11:48:53 +01:00
mlorb
3b96a60938
Merge pull request #1374 from mlorb/ml-sci-2842
Update the Export all confirmation modal and export interaction [SCI-2842]
2018-11-19 11:36:08 +01:00
Alex Kriuchykhin
d524a1d508
Merge pull request #1364 from okriuchykhin/ok_SCI_2778
Add time format selection to settings [SCI-2778]
2018-11-19 10:17:09 +01:00
Matej Zrimšek
c144d599fc Fix user smart annotation showing as if the user is removed from team [SCI-2861] 2018-11-19 08:02:25 +01:00
Matej Zrimšek
716e74ceb4 Fix DataTable display for protocol modal [SCI-2863] 2018-11-19 07:21:29 +01:00
Matej Zrimšek
dea4ed4e15 Add model name to the archive folders in export-all ZIP structure [SCI-2817] 2018-11-19 04:46:33 +01:00
mlorb
4b540958bd change close/cancel button and refactor export_project_modal endpoint 2018-11-16 13:37:32 +01:00
Alex Kriuchykhin
c184ca1c95
Merge pull request #1373 from okriuchykhin/ok_SCI_2860
Fix sorting on projects table [SCI-2860]
2018-11-15 16:28:41 +01:00
mlorb
6453ab6fb1 update the Export all confirmation modal and export interaction 2018-11-15 15:53:58 +01:00