Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge with apple #2

Merged
merged 57 commits into from
Jul 10, 2020
Merged

Merge with apple #2

merged 57 commits into from
Jul 10, 2020

Conversation

kutakmir
Copy link

No description provided.

gavirawson-apple and others added 30 commits March 18, 2020 12:46
@gavirawson-apple
Fix umbrella framework (#389)
713d932
@gavirawson-apple
Memory leak fix (#390)
1e26d67 
Fix memory leak
@erik-apple
Fix bug in deserialization of OCKScheduleElement (#391)
edc5b8f
@gavirawson-apple
Fix disappearing button border (#392)
62aba15 
Fix disappearing grid circles
@erik-apple
Added an atomic addOrUpdateTasks method to OCKStore. (#393)
7576b3d
@gavirawson-apple
Fix tint color propagation (#395)
b70e4ef
@erik-apple
Include addUpdateOrDelete in TaskStoreProtocol (#396)
87d2e4c
@ericlewis
fix: SwiftUI logic typo (#399)
b806cdf 
It appears that this is actually inverted for what it should be.
@erik-apple
Fix issue in which the address field on OCKContact was not serialized (…
f6a048d 
…#402)
@gavirawson-apple
Fix memory leak (#403)
9d0695b 
Fixes an issue that prevented the deallocation of some views.
@erik-apple
Fixes a bug in which the start date for weekly schedules was incorrec…
e4c1471 
…t. (#406)
@gavirawson-apple
SwiftUI API for the InstructionsTaskView (#409)
3eba835
@erik-apple
Fix bug where the animated flag in selectDate(_:animated:) wasn't pas…
df01680 
…sed (#412)
@cbaker6
Anchor action sheet in TaskViewController (#410)
610624a 
Fixes a crash on iPad and MacOS devices because the action sheet isn't anchored.
@erik-apple
CareKit Remote Synchronization API
12677e9 
Update .travis.yml
Clean up comments
@erik-apple
Merge pull request #426 from erik-apple/sync-api
7b3c392 
CareKit Remote Synchronization API
@erik-apple
Update OCKStore+Tasks.swift
f486328
@cbaker6
Query by uuid for Outcome and expose deletedDate
4a58cf3 
Fixes #432 and #433
@cbaker6
uuid in build predicate
1592a4d
@cbaker6
Add testcase
d318391
@cbaker6
Add uuids to query
65597c4
@cbaker6
fix travis
9ee908f
@cbaker6
clean up
314a408
@cbaker6
Remove extra code in test case.
0922758 
Switch outcome uuid var from versioned since outcomes aren't versioned
@cbaker6
Use getUUID
d37c3ba
@cbaker6
Remove tags
d6172ec
@cbaker6
Use OCKObjectCompatible getUUID instead over versioned
8aa43cb
@cbaker6
Switched versioned to object
03a83bc 
A couple of bug fixes in OCKStore+CarePlans.swift OCKStore+Contacts.swift
@cbaker6
Add test cases for bug fixes
8067e22
@cbaker6
update xcode in travis
fda5648
cbaker6 and others added 27 commits May 21, 2020 08:35
@cbaker6
xcode11.4 and xcode11.4.1 point to the same immage in travis
5bd80a9
@cbaker6
make compatible with xcode 11.3
25c2d14
@cbaker6
go back to iOS 13.3
b526eb4
@cbaker6
seeing if that mapping issue is just slow which is causing travis to …
7292d7e 
…timout
@cbaker6
go back to xcode 11.3 and iOS 13.3
964fc76
@erik-apple
Merge pull request #435 from cbaker6/patch-2
c8e5e19 
Query by uuid for Outcome and expose deletedDate
@erik-apple
Merge pull request #2 from carekit-apple/master
e62582f 
Merge upstream
@erik-apple
Allow queries that match against nil (#436)
eb920ac 
* Update OCKStore+Tasks.swift

* Support queries that match nil properties.
@erik-apple
Fix #439
150dccd 
OCKOutcomeValue's kind property was being persisted, but was not being populated onto structs when rehydrated from CoreData.
@erik-apple
Merge pull request #440 from erik-apple/fix-kind-persistence
58603e5 
Fix OCKOutcomeValue kind bug
@gavirawson-apple
Fix build errors (#441)
92368c4
@erik-apple
Ensure that the graph area grows before the legend when stretched (#443)
f03a289
@erik-apple
Expose a number formatter for chart axes
ed7d1a7 
Fix compilation failure
@erik-apple
Update OCKGridLayer.swift
662b081
@erik-apple
Merge pull request #444 from erik-apple/chart-number-formatter
f84d1ed 
Expose a number formatter for chart axes
@erik-apple
Show the bottom axis label when it's not 0.
e3519bf
@erik-apple
Merge pull request #449 from erik-apple/bottom-axis-label
3844b37 
Add bottom axis label
@garyphilipp
Update OCKContactUtility.swift (#454)
06d2a11
@erik-apple
Fix bug in which the label was used as the value for phone numbers. (#…
f782376 
…455)
@erik-apple
Fix breaking constraints on OCKCartesianChartView (#456)
4da6e6f
@cbaker6
Sync OCKPatient, OCKCarePlan, OCKContact with KnowledgeVector (#457)
0ce3d02
@erik-apple
CareKit 2.1 (#458)
3a5f847
@cbaker6
Add not on watchOS (#459)
0722f79
@erik-apple
CareKitFHIR (#461)
73998bd
@cbaker6
Update travis to xcode12 (#462)
c0ebb25
@erik-apple
Provide more fine grained logging control. (#466)
17024ac
@gavirawson-apple
Fix title label wrapping in OCKSimpleTaskView (#470)
30d6628 
* Update line break mode for multi-line text

* Fix compression/hugging for stack view behavior
@kutakmir kutakmir merged commit ea6ca20 into TheraForge:master Jul 10, 2020
marco-theraforge pushed a commit that referenced this pull request Apr 15, 2022
@invozeeshan
Merge pull request #2 from HippocratesTech/remove-warnings
1b6a656 
Warnings removed from the code.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
6 participants
@kutakmir @gavirawson-apple @erik-apple @ericlewis @cbaker6 @garyphilipp