GitHub/ResearchKit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,059 Commits 5 Branches 28 Tags
a96c8b95404b5b87fb6bbef361c19c8a49b1618f
Commit Graph
426 Commits
Author SHA1 Message Date
Ricardo Sánchez-Sáez 865275d3aa [Projects] Fix ResearchKit framework linkage for all 3 apps 
This links and embeds the workspace instance of ResearchKit from the three subprojects.

Also:
- Remove ResearchKit subproject reference from ORKCatalog.
- Link HealthKit framework from ORKSample.
- Link HealthKit and MapKit in an optional way.
- Reorganise frameworks into Framework group for each subproject.
 2016-01-27 12:39:55 +00:00
Ricardo Sánchez-Sáez 8d0fd95ad0 [ORKTestTests] Fix failing tests (mainly due ORKReviewStep) 2016-01-16 21:36:55 +00:00
Ricardo Sánchez-Sáez 46c78c08a4 [Workspace] Remove duplicated ResearchKit subproject references from ORKSample and ORKTest 
They're not needed since ResearchKit is already in the Workspace.
 2016-01-16 21:35:53 +00:00
Yuan Zhu dd4e4fdbce Merge pull request #596 from shazino/timed-walk-optional-form 
Add includeAssistiveDeviceForm parameter to timed walk task
 2016-01-14 16:00:33 -08:00
Oliver Schäfer 21c89256fa Merge remote-tracking branch 'apple/master' 2016-01-12 17:19:49 +01:00
Yuan Zhu 429c3c9886 Update the versioning and pod spec 2016-01-11 15:20:01 -08:00
vtourraine 94fbd3a6d1 Add includeAssistiveDeviceForm parameter to timed walk task 
Make timed walk assistive device form items non-optional
 2016-01-06 16:47:31 +01:00
Oliver Schäfer 3ae773049a PR updates 2015-12-29 12:20:54 +01:00
Oliver Schäfer 76eb4f97d9 Merge remote-tracking branch 'apple/master' 2015-12-28 17:45:52 +01:00
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
Oliver Schäfer e444086399 PR updates 2015-12-06 13:13:33 +01:00
Oliver Schäfer 7caaf525e3 PR updates 2015-12-03 13:05:22 +01:00
Yuan Zhu c27b784870 Merge branch 'convergence' of https://github.com/ResearchKit/ResearchKit into convergence 2015-12-01 15:31:58 -08:00
Andrew Hill 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
Oliver Schäfer 8b81a8c5f1 Merge remote-tracking branch 'apple/master' 2015-11-18 22:55:22 +01:00
Yuan Zhu 75ac5d3366 Fix typo. 2015-11-17 17:50:56 -08:00
Andrew Hill 8e49cbc733 Correct Destionation 
Changed all instances of Destionation to Destination
 2015-11-17 13:47:25 +00: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
Oliver Schäfer 2aa09084c8 PR updates 2015-11-06 22:16:43 +01:00
Oliver Schäfer 4d16e39f73 Merge remote-tracking branch 'apple/master' 2015-11-06 21:21:13 +01: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
Oliver Schäfer 59d2ed7a39 PR updates 2015-11-04 21:54:53 +01:00
Oliver Schäfer e5a4d01039 Merge remote-tracking branch 'apple/master' 2015-11-04 05:45:38 +01:00
Oliver Schäfer e7aac14571 PR update to fix ORKTextScaleAnswerFormat crash and re-connect embedded and standalone review step in ORKTest 2015-11-04 05:41:11 +01:00
Ricardo Sánchez-Sáez 50c0d4b3c0 ORKTest: improve code for Wait Task progress update 2015-11-03 22:24:35 +00:00
Oliver Schäfer 746b0866b0 PR changes related to displaying results 2015-11-03 22:23:27 +01: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
Oliver Schäfer fdd608fee4 Merge remote-tracking branch 'apple/master' 2015-10-26 17:30:54 +01: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
Oliver Schäfer 81ec1f0056 Merge remote-tracking branch 'apple/master' 2015-10-22 00:10:02 +02:00
Oliver Schäfer 36f710739d PR updates 2015-10-22 00:05:11 +02:00