GitHub/ResearchKit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,900 Commits 5 Branches 28 Tags
5bdd973315fb75e2d3b6f74bfbb5f0133db164ff
Commit Graph
396 Commits
Author SHA1 Message Date
Yuan Zhu 5bdd973315 Fix unit tests. 2015-12-16 10:30:09 -08:00
Yuan Zhu 287dcd979c Merge branch 'verificationRedesign' into 'convergence' 
Verification Step redesign.

Verification step redesign as per HI.

See merge request !20
 2015-12-14 16:47:48 -08:00
Yuan Zhu fe2ea1e3d8 Merge branch 'eligFix' into 'convergence' 
Removed eligibility module.

As per HI, the eligibility module should re-use the text choice answer format look and feel. This PR removes the current `ORKEligbilityAnswerFormat` and updates `ORKTest` and `ORKCatalog` examples of eligibility using `ORKTextChoiceAnswerFormat`.

See merge request !17
 2015-12-11 13:30:50 -08:00
Umer Khan d9c005aa18 Refactored eligibility survey also. 2015-12-10 16:40:27 -08:00
Umer Khan be02e1a22a Refactored eligibility task. 2015-12-10 16:38:59 -08:00
Umer Khan 88543a14d6 Verification Step redesign. 2015-12-09 17:11:35 -08:00
Yuan Zhu 48ed4b3771 Use the new icon for ORKTest app 2015-12-09 14:23:07 -08:00
Umer Khan 4153702c2d Removed eligibility answer format, survey cell, form item cell, and implementations from ORKTest and ORKCatalog. 2015-12-09 12:08:34 -08:00
Yuan Zhu 0b06d4c18a Add app icons for iPad pro 2015-12-09 10:41:22 -08:00
Yuan Zhu c27b784870 Merge branch 'convergence' of https://github.com/ResearchKit/ResearchKit into convergence 2015-12-01 15:31:58 -08:00
Andrew HillandYuan Zhu 2510bc7f97 Correct Destionation 
Changed all instances of Destionation to Destination
 2015-12-01 15:30:04 -08:00
Umer Khan e1ea72b861 Tapping sample result bug fix. 2015-11-30 17:58:46 -08:00
Yuan Zhu 140e1ebae0 Fix for rdar://problem/23638006 ResearchKit: updateText of ORKWaitStepViewController does not work as expected 2015-11-20 17:33:05 -08:00
Yuan Zhu 75ac5d3366 Fix typo. 2015-11-17 17:50:56 -08:00
Yuan Zhu a57a8d8370 Merge pull request #383 from rsanchezsaez/rsanchezsaez-navigationrules 
Add Swift tuple initializer overlay to ORKPredicateStepNavigationRule
 2015-11-09 10:31:44 -08:00
Yuan Zhu 18d50721cc Merge pull request #556 from rsanchezsaez/rsanchezsaez-ORKTestNamingConventions 
ORKTest: improve some class and method names
 2015-11-05 10:52:21 -08:00
Yuan Zhu 6563ebdca4 Clean up NSLog 2015-11-05 10:38:34 -08:00
Ricardo Sánchez-Sáez 50c0d4b3c0 ORKTest: improve code for Wait Task progress update 2015-11-03 22:24:35 +00:00
Yuan Zhu ca11a8def0 Merge branch 'master' of github.com:ResearchKit/ResearchKit into master_location_question_enhancement 
Conflicts:
	ResearchKit.xcodeproj/project.pbxproj
 2015-11-02 17:42:22 -08:00
Ricardo Sánchez-Sáez 20204946bc ORKTest: change case in comments 2015-11-01 22:20:20 +00:00
Ricardo Sánchez-Sáez 74dc33a654 ORKTest: improve some class and method names 2015-11-01 22:18:17 +00:00
Yuan Zhu f738f18570 Update to PR to improve UI experience. 2015-10-30 12:43:31 -07:00
Yuan Zhu 60af4ce1e5 Address PR feedback, remove location question from selection survey 2015-10-27 17:56:36 -07:00
Yuan Zhu 4ca0197532 Switch ORKLocationResult's answer from ORKPlacemark to ORKLocation 
Create location questions task in ORKTest
 2015-10-27 13:07:24 -07:00
Ricardo Sánchez-Sáez 0459818613 Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-navigationrules 
# Conflicts:
#	Testing/ORKTest/ORKTest.xcodeproj/project.pbxproj
#	Testing/ORKTest/ORKTest/MainViewController.m
 2015-10-26 22:43:35 +00:00
Umer Khan 99bdc3cbbc Merging upstream/master 2015-10-26 15:38:23 -07:00
Brandon McQuilkin 1b5ea88e0f Fixed issue causing tests to fail. 2015-10-22 15:13:48 -04:00
Brandon McQuilkin 1f26d5c5a1 Merge branch 'master' of https://github.com/ResearchKit/ResearchKit into LocationQuestion 
Conflicts:
	ResearchKit/Common/ORKResult.m
 2015-10-22 12:16:54 -04:00
Yuan Zhu 66884c045b Merge pull request #513 from rsanchezsaez/rsanchezsaez-NavigableOrderedTask 
Use results for backwards navigation in 'ORKNavigableOrderedTask'
 2015-10-21 13:47:55 -07:00
Umer Khan 50cd9055ac PR updates and added example to ORKTest. 2015-10-20 19:48:53 -07:00
Umer Khan d0226f29f7 Merge remote-tracking branch 'upstream/master' into account 2015-10-20 18:37:00 -07:00
Umer Khan eceeab053d PR feedback changes. 2015-10-20 18:36:30 -07:00
Yuan Zhu de0019054a Merge pull request #533 from md0u80c9/ORKFormItem-optionalConvenienceInit 
ORKFormItem optionalConvenienceInit
 2015-10-20 10:47:44 -07:00
Brandon McQuilkin 00183879ce Removed if statement left over from debugging. 2015-10-20 08:39:04 -04:00
Umer Khan 886bca74bf PR review modifications. 2015-10-19 14:03:36 -07:00
Brandon McQuilkin 5070517ba3 Removed unnecessary lines. 2015-10-19 13:17:00 -04:00
Brandon McQuilkin 4e7f24f1c2 Reverted indentation changes to ORKESerialization. 2015-10-19 08:20:11 -04:00
Ricardo Sánchez-Sáez 7bc407ee90 Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-navigationrules 2015-10-19 01:50:43 +01:00
Ricardo Sánchez-Sáez 96e94155d7 ORKTest: fix serialization tests 2015-10-19 01:49:15 +01:00
Ricardo Sánchez-Sáez 0471bf61d4 Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-NavigableOrderedTask 
# Conflicts:
#	Testing/ORKTest/ORKTest/MainViewController.m
 2015-10-18 20:24:10 +01:00
Umer Khan 696758bdc2 Added more validation checks. 2015-10-16 18:26:05 -07:00
Umer Khan f47f9d824c Updates 2015-10-16 16:23:13 -07:00
Umer Khan 17b7d7d4f9 Merge remote-tracking branch 'upstream/master' into account 2015-10-16 10:47:20 -07:00
Andrew HillandAndrew Hill d9e2f54c41 Changes made per UmerKhan-apple's suggestions 2015-10-16 08:19:34 +01:00
Umer Khan 9347ef6573 Updated serialization. 2015-10-15 18:03:49 -07:00
Brandon McQuilkin f9924ddbc0 Removed debug log from tests. 2015-10-15 08:44:24 -04:00
Andrew Hill 851bd4e2c5 Added ORKFormStep optional convenience initialiser. 
Updated the optional form test to confirm all is working.
 2015-10-15 04:13:05 +01:00
Yuan Zhu 9fbabf8f3b Merge pull request #528 from rsanchezsaez/rsanchezsaez-ChartsPerformanceTest 
ORKTest: add 'Test Charts Performance' item
 2015-10-14 18:04:34 -07:00
Yuan Zhu 181651b365 Update string. 2015-10-14 17:35:00 -07:00
Yuan Zhu b8d2c6bf86 Address review feedback 2015-10-14 17:33:42 -07:00