Commit graph

3826 commits

Author SHA1 Message Date
Alex Kriuchykhin
676d4da7d2
Merge pull request #1397 from okriuchykhin/ok_SCI_2885
Fix support menu for Safari [SCI-2885]
2018-11-27 11:21:29 +01:00
mlorb
398c2f0576
Merge pull request #1392 from mlorb/ml-sci-2676
Hide sign-in with third party applications (e.g. LinkedIn) in Oauth… [SCI-2676]
2018-11-27 11:06:45 +01:00
mlorb
0b6b3b3609 code simplify 2018-11-27 10:58:51 +01:00
Oleksii Kriuchykhin
79544e789d Fix support menu for Safari [SCI-2885] 2018-11-26 18:47:21 +01:00
Alex Kriuchykhin
d475197e65
Merge pull request #1396 from okriuchykhin/ok_SCI_2882
Fix handsontable initialization [SCI-2882]
2018-11-26 15:19:23 +01:00
Oleksii Kriuchykhin
d67abfda2c Additional fixies for smart annotations [SCI-2880] 2018-11-26 15:17:18 +01:00
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
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
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
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
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
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
mlorb
6453ab6fb1 update the Export all confirmation modal and export interaction 2018-11-15 15:53:58 +01:00
Oleksii Kriuchykhin
7642d8d472 Fix sorting on projects table [SCI-2860] 2018-11-15 10:36:37 +01:00
Luka Murn
e9c0b34662 Merge branch 'core-api' into 'master'
Conflicts:
	Gemfile
	app/services/api.rb
	config/initializers/api.rb
	config/initializers/extends.rb
	config/routes.rb
	db/schema.rb
	spec/controllers/api/api_controller_spec.rb
2018-11-14 16:59:04 +01:00
Alex Kriuchykhin
324069c071
Merge pull request #1370 from okriuchykhin/ok_SCI_2853
Allow automatic redirection to the O365 sign-in page in the business user flow [SCI-2853]
2018-11-14 13:51:43 +01:00
Oleksii Kriuchykhin
3fd687161f Remove unused variables from activities controller [SCI-2778] 2018-11-14 13:17:38 +01:00
Oleksii Kriuchykhin
537de596a7 Merge latest master [SCI-2778] 2018-11-14 13:05:57 +01:00
Oleksii Kriuchykhin
c44109958a Allow automatic redirection to the O365 sign-in page in the business user flow [SCI-2853] 2018-11-14 12:56:04 +01:00
Oleksii Kriuchykhin
380a96dcce Add caching for step and result fragments [SCI-2830] 2018-11-14 11:57:53 +01:00
Luka Murn
98a39ecd72 Fix visual bug (everything bold) on projects index page
Bug was introduced in projects absent section, there was no
closing </strong> tag.
2018-11-14 11:33:27 +01:00
Luka Murn
c0940b143a Fix root page bug introduced with merge features/core-api -> master 2018-11-13 21:24:20 +01:00
mz3944
056efe170b
Merge pull request #1358 from mz3944/mz-SCI-2646
Removal of the temporary files for export all [SCI-2646]
2018-11-13 20:31:04 +01:00
Oleksii Kriuchykhin
fb309a12b9 Refactor result and step comments initialization [SCI-2830] 2018-11-13 16:57:42 +01:00
Luka Murn
84df2c81f9 Merge branch 'features/export-all'
Conflicts:
	app/controllers/experiments_controller.rb
	app/controllers/my_modules_controller.rb
	db/schema.rb
2018-11-13 09:14:02 +01:00
Alex Kriuchykhin
b16646b0b4
Merge pull request #1366 from okriuchykhin/ok_SCI_2839
Improve Export All button behaviour [SCI-2839]
2018-11-12 17:32:33 +01:00
Oleksii Kriuchykhin
98d1ea8542 Improve Export All button behaviour [SCI-2839] 2018-11-12 15:51:03 +01:00
Oleksii Kriuchykhin
145c66a834 Fix user counters on projects overview page [SCI-2847] 2018-11-12 11:52:38 +01:00
Oleksii Kriuchykhin
e89d60785f Fix dates on activities and experiments [SCI-2778] 2018-11-12 10:26:48 +01:00
Matej Zrimšek
57dbd63aa3 Add archive badge for archived projetcs/experiments/modules in export-all PDF [SCI-2817] 2018-11-12 01:34:00 +01:00
Oleksii Kriuchykhin
8d0dbc7076 Add time format selection to settings [SCI-2778] 2018-11-09 16:19:40 +01:00
mlorb
75875e5421 fix user_project manage permission 2018-11-09 11:36:44 +01:00
Alex Kriuchykhin
eb72ea69dd
Merge pull request #1361 from okriuchykhin/ok_SCI_2785_v2
Improve counters on projects overview table [SCI-2785]
2018-11-09 09:37:41 +01:00
Matej Zrimšek
2a5b36b3c2 Fix index/position for export-all folder names [SCI-2817] 2018-11-09 01:21:30 +01:00
Matej Zrimšek
6ff117d662 Fix path creation and construction for export-all [SCI-2817] 2018-11-09 00:44:17 +01:00
Matej Zrimšek
f23160ba6d Refactor logic for handling model path in export-all [SCI-2817] 2018-11-08 23:23:23 +01:00
Matej Zrimšek
58b2310d26 Add archived models in corresponding archive directory [SCI-2817] 2018-11-08 23:21:25 +01:00
Matej Zrimšek
efb4e0c549 Change indexing in task names in export-all PDF [SCI-2817] 2018-11-08 21:48:09 +01:00
Matej Zrimšek
dc91be3749 Preserve task order from project sidebar in export-all file structure [SCI-2817] 2018-11-08 21:48:09 +01:00
Matej Zrimšek
08396b2101 Make folder and file names more readable for export-all ZIP [SCI-2817] 2018-11-08 21:48:09 +01:00
Matej Zrimšek
d65fcdc312 Change datetime to human friendly format for ZIP exports [SCI-2817] 2018-11-08 21:48:09 +01:00
Matej Zrimšek
159f6d1ee2 Minor refactoring of exports [SCI-2646] 2018-11-08 21:39:09 +01:00
Matej Zrimšek
b7fdd82409 Ensure temp files deletion after export is done [SCI-2646] 2018-11-08 21:32:07 +01:00
mlorb
a56d22a329
change count to size 2018-11-08 09:43:32 +01:00
Oleksii Kriuchykhin
1feb13c74a Improve counters on projects overview table [SCI-2785] 2018-11-07 22:27:57 +01:00
Oleksii Kriuchykhin
23ee4760ae Fix failing tests [SCI-2773] 2018-11-07 16:39:00 +01:00
Oleksii Kriuchykhin
30885e060d Merge latest core-api branch [SCI-2773] 2018-11-07 15:53:21 +01:00
Oleksii Kriuchykhin
60e78fa868 Improve code style for error handling [SCI-2773] 2018-11-07 15:43:44 +01:00
mlorb
4d156080ac fix empty projects page bug and projects tree bug 2018-11-07 13:45:46 +01:00
mlorb
039faf2964
Merge pull request #1359 from mlorb/ml-sci-2843
Fix bug with new project button not working [SCI-2843]
2018-11-07 11:02:47 +01:00
Oleksii Kriuchykhin
82a11ebca2 Remove duplicate destroy for report [SCI-2834] 2018-11-07 09:55:06 +01:00
Matej Zrimšek
2f6a6072e1 Fix repository ZIP export test to work with enabled workers [SCI-2646] 2018-11-07 06:14:40 +01:00
Matej Zrimšek
8fe0249f45 Fix test for repository ZIP export & return path for ZIP exports [SCI-2646] 2018-11-07 05:04:29 +01:00
mlorb
63e039e235 fix bug with new project button not working 2018-11-06 11:38:31 +01:00
Oleksii Kriuchykhin
0e192cc830 Ensure that temporary report is always deleted [SCI-2834] 2018-11-06 09:33:18 +01:00
Matej Zrimšek
ee611a45d9 Also remove temp file after other types of ZIP export generation [SCI-2646] 2018-11-04 01:39:16 +01:00
Matej Zrimšek
5defbdd76e Remove temp files after export-all ZIP generation [SCI-2646] 2018-11-04 01:33:50 +01:00
mlorb
ad5f4c2ebb
Merge pull request #1356 from mlorb/ml-sci-remove-protocol-show-endpoint
Remove show protocol api endpoint
2018-10-30 14:04:17 +01:00
Oleksii Kriuchykhin
daaeb385bb Fix permission helpers in delayed export job [SCI-2834] 2018-10-30 14:04:01 +01:00
Alex Kriuchykhin
2f466383a5
Merge pull request #1333 from okriuchykhin/ok_SCI_2742
RESTful API for Object Querying (READ) - unit tests [SCI-2742]
2018-10-29 16:26:58 +01:00
Alex Kriuchykhin
126fa03305
Merge pull request #1349 from okriuchykhin/ok_SCI_2818
Fix project index endpoint permission bug [SCI-2818]
2018-10-29 14:59:22 +01:00
Alex Kriuchykhin
1083ce61fb
Merge pull request #1352 from okriuchykhin/ok_SCI_2814
Rename user_id to sub in JWT [SCI-2814]
2018-10-29 14:54:00 +01:00
Alex Kriuchykhin
d0804c8969
Merge pull request #1350 from okriuchykhin/ok_SCI_2821
Fix relationships in activities serializer [SCI-2821]
2018-10-29 14:53:15 +01:00
Alex Kriuchykhin
098b18b405
Merge pull request #1348 from okriuchykhin/ok_SCI_2782
Fix inventory column creation permission check [SCI-2782]
2018-10-29 14:52:57 +01:00
Alex Kriuchykhin
4320af794b
Merge pull request #1353 from okriuchykhin/ok_SCI_2771
Fix API endpoints that return file URLs [SCI-2771]
2018-10-29 13:44:55 +01:00
Alex Kriuchykhin
2b4ef619c2
Merge pull request #1345 from okriuchykhin/ok_SCI_2785
Show all experiments and tasks for archived projects [SCI-2785]
2018-10-29 11:56:38 +01:00
mlorb
0f8c80172e remove show protocol api endpoint 2018-10-29 11:21:48 +01:00
Alex Kriuchykhin
c1d853f7bd
Merge pull request #1344 from okriuchykhin/ok_SCI_2783
Fix issue with project dropdown caching [SCI-2783]
2018-10-29 10:56:02 +01:00
Oleksii Kriuchykhin
5708e9bbe7 Fix project start day in serializer [SCI-2820] 2018-10-28 19:02:44 +01:00
Oleksii Kriuchykhin
d1e6c64d5e Fix API endpoints that return file URLs [SCI-2771] 2018-10-28 18:39:34 +01:00
mz3944
d733f4e357
Merge pull request #1346 from mz3944/mz-SCI-2787
In project list table table is not updated when archiving/restoring project [SCI-2787]
2018-10-28 14:36:17 +01:00
Oleksii Kriuchykhin
04ff5870af Rename user_id to sub in JWT [SCI-2814] 2018-10-28 14:34:51 +01:00
Jure Grabnar
0977f5251d
Merge pull request #1351 from jbargu/jg_add_zero_limit_to_export
Fix zero limit config on export all
2018-10-28 13:38:21 +01:00
Jure Grabnar
cab0b78afa Fix zero limit config on export all 2018-10-28 09:43:34 +01:00
Oleksii Kriuchykhin
012447d762 Fix relationships in activities serializer [SCI-2821] 2018-10-26 17:30:04 +02:00
Oleksii Kriuchykhin
9ad2718f32 Fix project index endpoint permission bug [SCI-2818] 2018-10-26 16:46:01 +02:00
Oleksii Kriuchykhin
93e7c3f390 Fix inventory column creation permission check [SCI-2782] 2018-10-26 14:38:47 +02:00
Alex Kriuchykhin
802290df8b
Merge pull request #1343 from okriuchykhin/ok_SCI_2826
Skip missing files in assets [SCI-2826]
2018-10-26 14:23:23 +02:00
Alex Kriuchykhin
b51f064c28
Merge pull request #1347 from okriuchykhin/ok_SCI_2756
Remove double initialization of comments on steps [SCI-2756]
2018-10-26 14:19:58 +02:00
Jure Grabnar
7d2f2c3b5f
Merge pull request #1337 from jbargu/jg_bug_sci_2805
Add can_export_project? permission to allow archived projects to be exported [SCI-2805]
2018-10-26 11:23:57 +02:00
mz3944
ee2cc90825
Merge pull request #1324 from mz3944/mz-SCI-2732
Export all - Projects view - projects endpoints (unit tests) [SCI-2732]
2018-10-26 11:20:09 +02:00
Jure Grabnar
04b1d0e142 Remove blank line 2018-10-26 11:00:13 +02:00
Jure Grabnar
3903b4a6f2 Refactor read_project/export_project permissions 2018-10-26 10:58:59 +02:00
Alex Kriuchykhin
f581829357
Merge pull request #1339 from okriuchykhin/ok_SCI_2804
Fix relative links to files in export all PDF [SCI-2804]
2018-10-26 10:57:04 +02:00
Oleksii Kriuchykhin
6e6bb73d2f Remove double initialization of comments on steps [SCI-2756] 2018-10-26 09:29:42 +02:00
Matej Zrimšek
6447750ff7 Fix showing projects in table view when all are archived [SCI-2787] 2018-10-25 22:31:00 +02:00
Alex Kriuchykhin
ababa0b157
Merge pull request #1340 from okriuchykhin/ok_SCI_2793
Fix helpers to use with export all [SCI-2793]
2018-10-25 16:55:39 +02:00
Oleksii Kriuchykhin
e9a8826a1e Show all experiments and tasks for archived projects [SCI-2785] 2018-10-24 18:49:59 +02:00
Oleksii Kriuchykhin
641d74829a Fix issue with project dropdown caching [SCI-2783] 2018-10-24 17:52:40 +02:00
Oleksii Kriuchykhin
744ad5b196 Skip missimg files in assets [SCI-2826] 2018-10-24 14:58:59 +02:00
Luka Murn
42793d25b7 Add bottom padding to sign in/up/forgot password pages
Closes SCI-2764.
2018-10-24 13:57:58 +02:00
Luka Murn
95340bcf36 Update team name placeholder & sublabel on sign up pages 2018-10-24 13:43:56 +02:00
Oleksii Kriuchykhin
990d3a34ca Fix link to inventory CSV file [SCI-2804] 2018-10-24 12:59:04 +02:00
Matej Zrimšek
c89488e105 Fix displaying projects when all are archived [SCI-2787] 2018-10-24 03:34:13 +02:00
Matej Zrimšek
43fdab561f Fix project archiving and restoring edge case [SCI-2787] 2018-10-24 01:37:57 +02:00
Matej Zrimšek
18e52e2c6f Fix fetching all user projects [SCI-2787] 2018-10-24 00:29:30 +02:00
Matej Zrimšek
c8d170f9ec Add default page size when it's not in request params when fetching projects 2018-10-23 19:51:50 +02:00
Oleksii Kriuchykhin
b53f2c8347 Improve error messages in API [SCI-2773] 2018-10-23 17:52:48 +02:00
Oleksii Kriuchykhin
81d751974d Fix helpers to use with export all [SCI-2793] 2018-10-22 14:32:10 +02:00
Oleksii Kriuchykhin
83566cc9d5 Fix relative links to files in export all PDF [SCI-2804] 2018-10-19 16:25:43 +02:00
Alex Kriuchykhin
e9b64b65a3
Merge pull request #1330 from okriuchykhin/ok_SCI_2770
Add request rate throttling for API [SCI-2770]
2018-10-19 09:38:31 +02:00
Jure Grabnar
bd5a2a43fd Add can_export_project? permission
Closes [SCI-2805].
2018-10-19 08:41:39 +02:00
mlorb
e5fca1b1cd change the rich text max limit on frontend to 50000 2018-10-18 14:22:15 +02:00
Alex Kriuchykhin
18b1cad8a4
Merge pull request #1334 from okriuchykhin/ok_SCI_2772
Implement inventory column data type name mappings [SCI-2772]
2018-10-17 10:37:23 +02:00
Oleksii Kriuchykhin
e4e66d3e5d Merge branch 'core-api' into ok_SCI_2742 2018-10-16 17:38:30 +02:00
Oleksii Kriuchykhin
02f536cd08 Merge latest features/export-all [SCI-2733] 2018-10-16 17:20:19 +02:00
Oleksii Kriuchykhin
ed46115b3f Implement inventory column data type name mappings [SCI-2772] 2018-10-16 15:35:02 +02:00
Oleksii Kriuchykhin
f6b039d54e Merge latest core-api branch [SCI-2765] 2018-10-16 12:07:47 +02:00
Jure Grabnar
c13e7531ea Change generate_team method name 2018-10-16 11:13:01 +02:00
Jure Grabnar
447cad083d Fix formatting according to HoundBot 2018-10-16 11:01:58 +02:00
Jure Grabnar
d50f56e319 Disable/enable export proejct button
Fix filesystem saving
2018-10-16 11:01:58 +02:00
Jure Grabnar
ed16e8d479 Fix reviewers errors 2018-10-16 11:00:38 +02:00
Jure Grabnar
6b47165ac1 Fix formatting according to Houndbot 2018-10-16 11:00:38 +02:00