Compare commits

...

10 Commits

Author SHA1 Message Date
Umer Khan c1493b9c5c Merge pull request #851 from ResearchKit/podspec
Podspec
2016-10-26 13:09:39 -07:00
Umer Khan d47e835e8e Merge branch 'master' into podspec
* master:
  convergence
  Update pod spec version number.
  Declare ORKScrollToTopAnimationDuration and ORKCGFloatInvalidValue as extern in ORKHelpers.h; fixes #679
2016-10-26 13:08:56 -07:00
Umer Khan 4b456ad2bb Merge pull request #850 from ResearchKit/stable
Stable
2016-10-26 12:48:49 -07:00
Umer Khan 125ff93795 Updating podspec 2016-10-26 12:40:56 -07:00
Umer Khan 2a1bbeefe8 Merge branch 'master' into stable
* master: (346 commits)
  Updating podspec.
  Convergence
  Fixed width constraint priority
  Make ORKInstructionStepViewController and ORKCompletionStepViewController public
  Add comment to the aux image.
  Add example use of the auxillary image.
  created the touchIdEnabled serializable encoding, confirm all tests pass
  Typo in function name
  Add ORKTappingButtonIdentifier rather than NSInteger
  added taskViewController didChangeResult implementation example to show how to get the ORKPasscodeResult information in the delegate
  Fix merge errors
  as per PR comment edited the ORKPasscodeResult to handle a new boolean property touchIdEnabled, in encoding/decoding, copying, and description
  removed the forced taskViewController delegate call from the ORKPasscodeStepViewCOntroller as its already calling it on its own, so no need for double
  added the delegate call when the prompt for touchID call is complete
  Erased asterisk/pointer from my last pull request
  Fixing bug where timer label did not display
  invalid pointer updates (warning fixes)
  Fix documentation typo
  Update ORKPicker.m
  Documented the ORKPicker functions.
  ...

# Conflicts:
#	ResearchKit.podspec
#	ResearchKit/ResearchKit.h
#	ResearchKit/ResearchKit_Private.h
2016-10-26 12:36:20 -07:00
Umer Khan ddc023fd4c Merge pull request #849 from ResearchKit/podspec
Updating podspec.
2016-10-26 11:31:58 -07:00
Umer Khan 160bb111f0 Updating podspec. 2016-10-26 11:31:36 -07:00
Yuan Zhu 30742a5043 convergence 2016-09-27 13:42:56 -07:00
Yuan Zhu 4259a1cc92 Update pod spec version number. 2016-05-24 10:54:15 -07:00
Ben DiFrancesco 70d4532d0e Declare ORKScrollToTopAnimationDuration and ORKCGFloatInvalidValue as extern in ORKHelpers.h; fixes #679 2016-05-24 10:53:53 -07:00
+1 -1
View File
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'ResearchKit'
s.version = '1.3.1'
s.version = 1.4.1
s.summary = 'ResearchKit is an open source software framework that makes it easy to create apps for medical research or for other research projects.'
s.homepage = 'https://www.github.com/ResearchKit/ResearchKit'
s.documentation_url = 'http://researchkit.github.io/docs/'