5fe7c7f49e
Adding default answer property to ORKTextAnswerFormat and ORKNumericAnwerFormat
2018-02-12 15:26:57 -08:00
d43c1168e5
Merge branch 'master' of github.com:ResearchKit/ResearchKit into ninoguba/weight_answer_format
...
# Conflicts:
# ResearchKit.xcodeproj/project.pbxproj
2017-12-06 01:01:30 -08:00
e2f178c0e9
Fix more issues that were accepted into master of buggy code.
...
Issues with ORKToneAudiometryResult and ORKWebViewStep discovered during unit testing of ORKTest.
2017-12-04 12:59:55 -08:00
80720c1281
Fixes to classes introduces since last March that fail unit tests.
2017-12-04 12:36:46 -08:00
16dfd0e677
Merge branch 'master' of github.com:ResearchKit/ResearchKit into ninoguba/weight_answer_format
...
# Conflicts:
# Testing/ORKTest/ORKTestTests/ORKESerialization.m
2017-12-03 22:31:08 -08:00
e10bb71e03
Merge branch 'master' into pr/split-ORKResult
...
# Conflicts:
# ResearchKit/Common/ORKResult.h
# ResearchKit/Common/ORKResult.m
2017-12-01 15:37:19 -08:00
c8195bddbc
ORKTest: Add shouldPresentStep validation example to exercise skip logic in form step
2017-11-28 18:05:20 -05:00
f49b3015c1
Merge pull request #1032 from rsanchezsaez/rss/fix-additional-warnings
...
[Misc] Fix additional Xcode 9.1 warnings
2017-11-21 16:54:17 -08:00
6c4075258b
Add back to ORKTest
2017-11-21 16:44:58 -05:00
4bf5df0a19
Merge flog
2017-11-21 16:40:02 -05:00
fbb39e1cc5
Fix merge flog
2017-11-21 16:37:54 -05:00
9c6c08380b
Merge branch 'master' of https://github.com/ResearchKit/ResearchKit into WebViewStep2
2017-11-21 16:11:54 -05:00
271bbba44b
[ORKWeightAnswerFormat] Fix serialization tests
2017-11-20 22:39:27 -08:00
f10573e71b
Merge branch 'master' of github.com:ResearchKit/ResearchKit into ninoguba/weight_answer_format
2017-11-20 21:32:00 -08:00
06a58fab3a
[Misc] Fix additional Xcode 9.1 warnings
2017-11-20 21:30:58 -08:00
b9c5ed66bb
Merge pull request #1031 from rsanchezsaez/rss/fix-unit-tests
...
[Misc] Fix unit tests
2017-11-17 11:35:59 -08:00
db51765a9b
Merge branch 'master' into pr/split-ORKResult
2017-11-17 09:39:52 -08:00
d50a51c769
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rss/Xcode-9.1
...
# Conflicts:
# Testing/ORKTest/ORKTest/MainViewController.m
2017-11-16 20:41:42 -08:00
18b730169f
[ORKWeightAnswerFormat] Re-add ORKTest examples
2017-11-16 01:17:37 -08:00
7a1d69a9d1
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rss/weight_answer_format
...
# Conflicts:
# ResearchKit/Common/ORKTypes.h
# ResearchKit/Common/ORKTypes.m
# Testing/ORKTest/ORKTest/MainViewController.m
2017-11-16 01:10:40 -08:00
3108e24830
[ORKWeightPicker] Update ORKTest sample code placeholders
2017-11-16 00:40:39 -08:00
af08beeb4c
[ORKTests] Fix ORKImageChoice serialization tests
2017-11-16 00:03:25 -08:00
86beb05399
[ORKNumericAnswerFormat] Rename ‘scale’ to ‘maximumFractionDigits’ and fix serialization tests
2017-11-15 23:47:52 -08:00
b3dfb08f50
[ORKWeightAnswerFormat] Use ‘double’ instead of ’NSNumber’ for numeric parameters
2017-11-15 22:54:43 -08:00
e8ed8d2c7e
Merge pull request #953 from rsanchezsaez/rss/ORKTest-refactor-b
...
[ORKTest] Extract task-creating methods to new TaskFactory class
2017-11-15 10:10:51 -08:00
73aa1157e6
Revert "[Misc] Update my copyright"
...
This reverts commit cb94f06094
2017-11-14 14:40:44 -08:00
0a40250aea
Add to ORKTest
2017-11-14 09:46:42 -05:00
31a86204a9
[Misc] Fix ORKTextChoice warnings
2017-11-14 00:42:10 -08:00
a3f9680006
[Projects] Update all projects to the recommended Xcode 9.1 settings
2017-11-14 00:27:10 -08:00
9a635b7227
Added ORKWeightAnswerFormat
2017-09-05 14:50:24 -07:00
75d8e0d167
Merge branch 'master' into pr/split-ORKResult
...
# Conflicts:
# ResearchKit.xcodeproj/project.pbxproj
# ResearchKit/Common/ORKResult.h
# ResearchKit/Common/ORKResult.m
2017-09-05 10:08:37 -07:00
184b1938e5
Version Fixes
2017-07-13 11:51:31 -07:00
a2d2b13d58
COnvergence
2017-07-06 18:15:56 -07:00
e52e22e8f5
Convergence
2017-07-06 15:48:38 -07:00
724dd34bac
[ORKTest] Re-add Stroop Task
2017-06-21 00:48:32 -07:00
7c6e83a0fc
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rss/ORKTest-refactor-b
...
# Conflicts:
# Testing/ORKTest/ORKTest/MainViewController.m
# Testing/ORKTest/ORKTest/Tasks/TaskFactory.swift
2017-06-21 00:43:31 -07:00
e6e4698306
Convergence
2017-06-07 10:10:19 -07:00
3697e01b6f
[ORKTest] Fix serialization tests
2017-04-06 02:15:26 -07:00
6bde09345f
[ORKTest] Homogenize step and item identifiers
2017-04-02 23:13:11 -07:00
a81c577fc3
[ORKTest] Convert iterruptible example to block based interface
2017-04-01 01:13:02 -07:00
2058936108
Fix equality for ORKLocation
2017-03-31 17:00:16 -07:00
5be15107b3
Merge branch 'master' into pr/split-ORKResult
...
# Conflicts:
# ResearchKit.xcodeproj/project.pbxproj
# ResearchKit/Common/ORKResult.h
# ResearchKit/Common/ORKResult.m
# ResearchKit/Common/ORKResult_Private.h
2017-03-31 12:41:29 -07:00
238cae5d31
[ORKTest] Consolidate the rest of examples that use 'stepViewControllerWillAppear:'
2017-03-30 21:52:52 -07:00
0870abc22b
[ORKTest] Consolidate stepViewControllerWillAppear: examples in new "Step Will Appear" test
...
Also, reimplement 'stepViewControllerWillDisappear:' example using the block based approach; and delete a few no longer needed task helper properties.
2017-03-30 21:22:02 -07:00
0a377eda53
[ORKTest] Begin removal of taskViewController:stepViewControllerWillAppear: test code
...
Use a block associated to the relevant ORKStep instead.
2017-03-29 22:35:42 -07:00
1fc013742a
[ORKTest] Get rid of task identifier constants
...
It now uses the automatically generated task identifiers. This also adds a NSObject (TaskFactory) helper category for commicating task intent to the MainViewController.
2017-03-29 21:12:26 -07:00
2a196bc768
[ORKTest] Update copyright headers for new files
2017-03-28 20:13:12 -07:00
6bb2313a1f
[TaskFactory+Forms] Resolve merge conflict
2017-03-28 20:07:55 -07:00
dcd0be1132
Merge branch 'master' of github.com:ResearchKit/ResearchKit into rss/ORKTest-refactor-b
...
# Conflicts:
# Testing/ORKTest/ORKTest/MainViewController.m
2017-03-28 20:03:19 -07:00
343be912d0
[ORKtest] Reorganize TaskFactory into categories
...
Also, reorganize some project files.
2017-03-28 01:23:30 -07:00
Akshay
Ricardo Sanchez-Saez
Shannon Young
Mike Mertsock
kelseydedoshka-apple
chrisnowak
Ricardo Sanchez-Saez
Nino Guba
Akshay