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.

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

Trim down content in CONTRIBUTING.md, move detailed content to Wiki. #190

Merged
merged 2 commits into from May 1, 2016
Merged

Conversation

ghost
Copy link

@ghost ghost commented Apr 26, 2016

Moved Syncing and other content to Contributions page of Wiki. Added a screenshot for submitting a PR (banner that appears on GitHub).

Potentially a few more bullets that I think may be able to added into CONTRIBUTING.md without bloating the file too much.

Some ideas for the sections in the Contributions page of the Wiki:

  • Squashing commits
  • Maintaining a local fork of the repo (over time)

This (potentially) closes #49. But probably not, since this still needs feedback!

0. Submit a [pull request](https://github.com/zen-audio-player/zen-audio-player.github.io/pulls) - Travis CI will run tests to make sure nothing broke.
0. In case the following occurs, skip to **[Syncing](#syncing)** below
0. Submit a [pull request](https://github.com/zen-audio-player/zen-audio-player.github.io/pulls) - Travis CI will run tests to make sure nothing broke. Once you have committed your changes locally and pushed them to your fork of the repo, a banner with a **Compare & pull request** button should appear on the main Zen Audio Player repo page to submit a pull request.
![submit pr](/.github/submit_pr.png)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This may be a broken link, I don't think you need the leading / either way

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you referring to the pull request link? It's working for me.
And are you saying github.com/zen-audio-player/zen-audio-player.github.io/pulls is preferable over https://github.com/zen-audio-player/zen-audio-player.github.io/pulls?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think /.github/submit_pr.png might not need the first /, not sure if it will work with it there

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah! I was looking at the wrong link, that makes sense.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that I took a closer look, the link for that other screenshot: /.github/outofsync.png has the same leading backslash and seems to link properly. Would you still recommend removing them (from both links)?

Copy link
Member

@shakeelmohamed shakeelmohamed Apr 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, when I see a path beginning with / I think of the root of a *nix filesystem... which is probably not what we want here even if the leading / "just works" 😆

@shakeelmohamed
Copy link
Member

Thanks @josectello, we should do the same for the PR & issue templates. I fear they're too long to actually be used.

For the wiki, can you create another page and move your additions there? The "Contribution Flow" page was meant to only be that first section I added.

The actual changes to CONTRIBUTING.md look fine. After you add the new wiki page, you should be able to link to a specific heading within a wiki page like you do in the steps.

@ghost
Copy link
Author

ghost commented Apr 26, 2016

@shakeelmohamed I'll get on that today. Thanks!

@ghost
Copy link
Author

ghost commented Apr 28, 2016

@shakeelmohamed You're probably very busy as well, but I was wondering if you saw my line comment about link above.

joseteIIo and others added 2 commits April 28, 2016 19:50
Updated README, closes #182

Browser compatibility matrix in progress, referencing #48

Added icons, referencing #48

Modified icons, referencing #48

Browser compatibility matrix done, referencing #48

Resized images, referencing #48

Fixed, referencing #48

Fixed 1, referencing #48

Fixed 2, referencing #48

Fix: pause video when we get an error

This needs to happen since we hide the controls.

Update primer (#189)

Signed-off-by: Matthew Brener <[email protected]>

Update primer

Signed-off-by: Matthew Brener <[email protected]>
@shakeelmohamed shakeelmohamed merged commit 7937fc9 into zen-audio-player:master May 1, 2016
@shakeelmohamed
Copy link
Member

Looks great, thanks @josectello! For the record, leave a comment after you've made changes otherwise I won't get a notification 😴

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Docs
2 participants