Skip to content
This repository has been archived by the owner on Feb 15, 2022. It is now read-only.

Merges develop into master #203

Merged
merged 290 commits into from
Feb 3, 2017
Merged

Merges develop into master #203

merged 290 commits into from
Feb 3, 2017

Conversation

mliberatore
Copy link
Contributor

For our 1.0.0 release, this merges all changes from develop into master.

mliberatore and others added 30 commits June 24, 2016 15:50
@mliberatore
Renames viewLog(_:collector:fromViewController:)
a652f47
@mliberatore
Renames succeed(_:)
5ba2846
@mliberatore
Renames fail(:_)
3195e9d
@mliberatore
Renames attachFeedback(_:)
d45d005
@mliberatore
Revert "Renames attachFeedback(_:)"
f346232 
This reverts commit d45d005.
@mliberatore
Renames attachFeedback(_:)
c2057d2
@mliberatore
Renames attachScreenshot(_:)
9abbe93
@mliberatore
Renames attachLogs(_:)
55f2f70
@mliberatore
Renames attachImage(_:)
2c15372
@mliberatore
Renames attachText(_:)
5fc4b24
@mliberatore
Renames attachAdditionalInformation(_:)
8dcf204
@mliberatore
Renames feedbackCollector(_:didCollectFeedback:)
d6ce17e
@mliberatore
Renames sender(_:didSendFeedback:success)
c79008d
@mliberatore
Renames pinpointKit(_:willSendFeedback:)
3236d1a
@mliberatore
Renames pinpointKit(_:didSendFeedback:)
b435caa
@mliberatore
Renames sender(_:didFailToSendFeedback:error:)
17a3024
@mliberatore
Removes optional feedbackRecipients from Configuration
4cc2238 
This removes the possibility for a `defaultPinpointKit` and requires the API user to specify recipients up front.
@mliberatore
show(fromViewController:) → show(from viewController)
5f7fadb
@mliberatore
Drops UIFont prefix where it can be inferred
293e2c5
@mliberatore
Fixes missed change to SenderDelegate implementation
cb2783d
@mliberatore
sendFeedback(_:fromViewController:) → send(_:from:)
1bbce43
@mliberatore
Merge branch 'swift-3.0-api-guidelines-pass-1' into swift-3.0-api-gui…
60d9e5c 
…delines-pass-2
@mliberatore
takeScreenshot(_:application:) → takeScreenshot(of:in:)
00e49d9
@mliberatore
screenshotDetector(_:didFailWithError:) → screenshotDetector(_:didFai…
5c44676 
…lWith:)
@mliberatore
Removes default property assignment
7c0d89e 
`delegate` is optional, so `= nil` isn’t required for full specification by the end of initialization
@mliberatore
succeed(_:) → succeed(with:) and fail(_:) → fail(with:)
cabb9a9
@mliberatore
screenshotDetector(_:didDetectScreenshot:) → screenshotDetector(_:did…
c6738d6 
…Detect:)
@mliberatore
Corrects documentation typos
cf0f528
@mbbischoff
Merge pull request #127 from Lickability/swift-3.0-beta-1-migration
81b48bf 
Swift 3.0 Beta 1 Migration
@mliberatore
pinpointOrangeColor() → pinpointOrange()
c419756
@mliberatore mliberatore mentioned this pull request Jan 27, 2017
Merged
@mbbischoff
Copy link
Member

Blocked by #205.

@mliberatore mliberatore mentioned this pull request Feb 3, 2017
Merged
@mbbischoff
Copy link
Member

@mliberatore is this now ready to go?

@mliberatore
Copy link
Contributor Author

Yes, was hinging on #205, which I’ve just closed. Thanks! Might be good to get @bcapps or @Twigz to weigh in on the recent changes before merging it in.

@mbbischoff mbbischoff merged commit c3bbb00 into master Feb 3, 2017
@mliberatore mliberatore mentioned this pull request Feb 7, 2017
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@mbbischoff mbbischoff mbbischoff approved these changes

Assignees

@mbbischoff mbbischoff

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@mliberatore @mbbischoff @bcapps @factotvm @harri121 @ChristianSteffens @Twigz @horovodovodo4ka