From 7e9ffd35eaf05ac0290af326f17d83c154b973de Mon Sep 17 00:00:00 2001 From: Andreas Linde Date: Thu, 23 Jul 2015 10:56:00 +0200 Subject: [PATCH 1/2] Add contributor license into readme --- README.md | 10 ++++++++-- docs/Guide-Installation-Setup-template.md | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 416a979bff..4ee3291488 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,8 @@ This document contains the following sections: 9. [Debug information](#debug) 4. [Documentation](#documentation) 5. [Contributing](#contributing) -6. [Contact](#contact) +6. [Contributor License](#contributorlicense) +7. [Contact](#contact) ## 1. Requirements @@ -452,7 +453,12 @@ We're looking forward to your contributions via pull requests. * [AppleDoc](https://github.com/tomaz/appledoc) * [Cocoapods](https://cocoapods.org/) + +## 6. Contributor License + +You must sign a [Contributor License Agreement](https://cla.microsoft.com/) before submitting your pull request. To complete the Contributor License Agreement (CLA), you will need to submit a request via the [form](https://cla.microsoft.com/) and then electronically sign the CLA when you receive the email containing the link to the document. You need to sign the CLA only once to cover submission to any Microsoft OSS project. + -## 6. Contact +## 7. Contact If you have further questions or are running into trouble that cannot be resolved by any of the steps here, feel free to open a Github issue here or contact us at [support@hockeyapp.net](mailto:support@hockeyapp.net) diff --git a/docs/Guide-Installation-Setup-template.md b/docs/Guide-Installation-Setup-template.md index 78741a0235..724d70491f 100644 --- a/docs/Guide-Installation-Setup-template.md +++ b/docs/Guide-Installation-Setup-template.md @@ -20,7 +20,8 @@ This document contains the following sections: 9. [Debug information](#debug) 4. [Documentation](#documentation) 5. [Contributing](#contributing) -6. [Contact](#contact) +6. [Contributor License](#contributorlicense) +7. [Contact](#contact) ## 1. Requirements @@ -437,7 +438,12 @@ We're looking forward to your contributions via pull requests. * [AppleDoc](https://github.com/tomaz/appledoc) * [Cocoapods](https://cocoapods.org/) + +## 6. Contributor License + +You must sign a [Contributor License Agreement](https://cla.microsoft.com/) before submitting your pull request. To complete the Contributor License Agreement (CLA), you will need to submit a request via the [form](https://cla.microsoft.com/) and then electronically sign the CLA when you receive the email containing the link to the document. You need to sign the CLA only once to cover submission to any Microsoft OSS project. + -## 6. Contact +## 7. Contact If you have further questions or are running into trouble that cannot be resolved by any of the steps here, feel free to open a Github issue here or contact us at [support@hockeyapp.net](mailto:support@hockeyapp.net) From f7bb142f8604b2fa49dca751971cfcea0b0a96c5 Mon Sep 17 00:00:00 2001 From: Tony Arnold Date: Fri, 7 Aug 2015 13:38:23 +1000 Subject: [PATCH 2/2] Remove @param documentation command used with a property, not a method/function --- Classes/BITFeedbackManager.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Classes/BITFeedbackManager.h b/Classes/BITFeedbackManager.h index 6538d29f2e..4eb6fd8cae 100644 --- a/Classes/BITFeedbackManager.h +++ b/Classes/BITFeedbackManager.h @@ -228,7 +228,6 @@ typedef NS_ENUM(NSInteger, BITFeedbackObservationMode) { All NSString-Content in the array will be concatenated and result in the message, while all UIImage and NSData-instances will be turned into attachments. - @param items an NSArray with objects that should be attached @see `[BITFeedbackComposeViewController prepareWithItems:]` */ @property (nonatomic, copy) NSArray *feedbackComposerPreparedItems;