Skip to content

Commit 488be44

Browse files
author
Mori Atsushi
authored
Merge pull request #141 from cyder/development
Development → Mater
2 parents 3189a98 + fbd71fb commit 488be44

41 files changed

Lines changed: 4551 additions & 77 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Cartfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ github "gilesvangruisen/Swift-YouTube-Player"
66
github "Alamofire/AlamofireImage" ~> 3.3
77
github "xmartlabs/XLPagerTabStrip" ~> 8.0
88
github "malcommac/ScrollingStackContainer" ~> 0.5
9+
github "youtube/youtube-ios-player-helper"

Cartfile.resolved

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ github "danielrhodes/Swift-ActionCableClient" "v0.2.3"
66
github "gilesvangruisen/Swift-YouTube-Player" "v0.4.0"
77
github "malcommac/ScrollingStackContainer" "0.5.0"
88
github "xmartlabs/XLPagerTabStrip" "8.0.1"
9+
github "youtube/youtube-ios-player-helper" "0.1.6"
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# iOS
2+
.DS_Store
3+
Pods/
4+
Podfile.lock
5+
xcuserdata/
6+
*.xcworkspace/
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Copyright 2014 Google Inc. All rights reserved.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
# YouTube-Player-iOS-Helper CHANGELOG
16+
17+
## 0.1.0
18+
19+
Initial release.
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# How to contribute #
2+
3+
We'd love to accept your patches and contributions to this project. There are
4+
a just a few small guidelines you need to follow.
5+
6+
7+
## Contributor License Agreement ##
8+
9+
Contributions to any Google project must be accompanied by a Contributor
10+
License Agreement. This is not a copyright **assignment**, it simply gives
11+
Google permission to use and redistribute your contributions as part of the
12+
project.
13+
14+
* If you are an individual writing original source code and you're sure you
15+
own the intellectual property, then you'll need to sign an [individual
16+
CLA][].
17+
18+
* If you work for a company that wants to allow you to contribute your work,
19+
then you'll need to sign a [corporate CLA][].
20+
21+
You generally only need to submit a CLA once, so if you've already submitted
22+
one (even if it was for a different project), you probably don't need to do it
23+
again.
24+
25+
[individual CLA]: https://developers.google.com/open-source/cla/individual
26+
[corporate CLA]: https://developers.google.com/open-source/cla/corporate
27+
28+
29+
## Submitting a patch ##
30+
31+
1. It's generally best to start by opening a new issue describing the bug or
32+
feature you're intending to fix. Even if you think it's relatively minor,
33+
it's helpful to know what people are working on. Mention in the initial
34+
issue that you are planning to work on that bug or feature so that it can
35+
be assigned to you.
36+
37+
1. Follow the normal process of [forking][] the project, and setup a new
38+
branch to work in. It's important that each group of changes be done in
39+
separate branches in order to ensure that a pull request only includes the
40+
commits related to that bug or feature.
41+
42+
1. Test your code on a device if you can. There are a bunch of edge conditions
43+
that can be triggered in `UIWebView` where behavior in the simulator is
44+
going to differ from behavior on a physical device.
45+
46+
1. Any significant changes should almost always be accompanied by tests. The
47+
project already has good test coverage, so look at some of the existing
48+
tests if you're unsure how to go about it.
49+
50+
1. Do your best to have [well-formed commit messages][] for each change.
51+
This provides consistency throughout the project, and ensures that commit
52+
messages are able to be formatted properly by various git tools.
53+
54+
1. Finally, push the commits to your fork and submit a [pull request][].
55+
56+
[forking]: https://help.github.com/articles/fork-a-repo
57+
[well-formed commit messages]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
58+
[squash]: http://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits
59+
[pull request]: https://help.github.com/articles/creating-a-pull-request

0 commit comments

Comments
 (0)