Merge pull request #5 from YuanZhu-apple/master

Fix issue #4: Update submodule reference to make it compile.
ResearchKit · Jun 26, 2015 · a21285e · a21285e
2 parents 5b55fa4 + 1302969
commit a21285e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/Diabetes/Startup/APHAppDelegate.m b/Diabetes/Startup/APHAppDelegate.m
@@ -33,7 +33,6 @@
 
 #import "APHAppDelegate.h"
 #import "APHProfileExtender.h"
-#import "APHAppDelegate+APHMigration.h"
 #import "APHGlucoseLevelsMealTimesViewController.h"
 
 #pragma mark - Survey Identifiers

diff --git a/ResearchKit b/ResearchKit
+7 −7		README.md
+8 −0		ResearchKit.xcodeproj/project.pbxproj
+1 −1		ResearchKit/ActiveTasks/ORKAccelerometerRecorder.m
+2 −2		ResearchKit/ActiveTasks/ORKActiveStepQuantityView.h
+1 −1		ResearchKit/ActiveTasks/ORKActiveStepViewController.h
+3 −3		ResearchKit/ActiveTasks/ORKHealthQuantityTypeRecorder.h
+1 −1		ResearchKit/ActiveTasks/ORKSpatialSpanMemoryContentView.h
+2 −2		ResearchKit/ActiveTasks/ORKSpatialSpanTargetView.m
+16 −16		ResearchKit/Common/ORKAnswerFormat.h
+2 −3		ResearchKit/Common/ORKFormItemCell.h
+0 −2		ResearchKit/Common/ORKFormItemCell.m
+1 −1		ResearchKit/Common/ORKFormStep.m
+1 −19		ResearchKit/Common/ORKFormStepViewController.m
+1 −6		ResearchKit/Common/ORKHTMLPDFWriter.m
+1 −1		ResearchKit/Common/ORKHeadlineLabel.h
+3 −3		ResearchKit/Common/ORKHealthAnswerFormat.h
+3 −3		ResearchKit/Common/ORKHelpers.m
+1 −1		ResearchKit/Common/ORKNavigationContainerView_Internal.h
+2 −2		ResearchKit/Common/ORKResult.m
+1 −1		ResearchKit/Common/ORKStep.m
+1 −1		ResearchKit/Common/ORKStepViewController.m
+0 −2		ResearchKit/Common/ORKSubheadlineLabel.h
+1 −34		ResearchKit/Common/ORKSubheadlineLabel.m
+0 −11		ResearchKit/Common/ORKTableContainerView.h
+8 −2		ResearchKit/Common/ORKTableContainerView.m
+1 −1		ResearchKit/Common/ORKTaskViewController.m
+0 −2		ResearchKit/Common/ORKTextButton.h
+3 −19		ResearchKit/Common/ORKTextButton.m
+43 −0		ResearchKit/Common/UIApplication+ResearchKit.h
+49 −0		ResearchKit/Common/UIApplication+ResearchKit.m
+32 −5		ResearchKit/Consent/ORKConsentSceneViewController.m
+1 −1		ResearchKit/Consent/ORKConsentSharingStepViewController.m
+10 −0		ResearchKitTests/ORKAccessibilityTests.m
+11 −1		ResearchKitTests/ORKChoiceAnswerFormatHelperTests.m
+10 −0		ResearchKitTests/ORKConsentTests.m
+2 −0		ResearchKitTests/ORKDataLoggerManagerTests.m
+11 −0		ResearchKitTests/ORKDataLoggerTests.m
+18 −0		ResearchKitTests/ORKHKSampleTests.m
+5 −4		ResearchKitTests/ORKRecorderTests.m
+11 −0		ResearchKitTests/ORKResultTests.m
+16 −0		ResearchKitTests/ORKTextChoiceCellGroupTests.m
+2 −2		docs/ActiveTasks/ActiveTasks-template.markdown
+2 −2		docs/InformedConsent/InformedConsent-template.markdown
+2 −2		docs/Survey/CreatingSurveys-template.markdown
+1 −1		samples/ORKCatalog/readme.md