Skip to content

Commit 2631ac1

Browse files
authored
Merge branch 'master' into add-code-of-conduct-1
2 parents 2566a07 + ff1f327 commit 2631ac1

File tree

3 files changed

+53
-7
lines changed

3 files changed

+53
-7
lines changed

ISSUE_TEMPLATE.md

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
Your issue may already be reported!
2+
Please search on the [issue track](../) before creating one.
3+
4+
## Expected Behavior
5+
<!--- If you're describing a bug, tell us what should happen -->
6+
<!--- If you're suggesting a change/improvement, tell us how it should work -->
7+
8+
## Current Behavior
9+
<!--- If describing a bug, tell us what happens instead of the expected behavior -->
10+
<!--- If suggesting a change/improvement, explain the difference from current behavior -->
11+
12+
## Possible Solution
13+
<!--- Not obligatory, but suggest a fix/reason for the bug, -->
14+
<!--- or ideas how to implement the addition or change -->
15+
16+
## Steps to Reproduce (for bugs)
17+
<!--- Provide a link to a live example, or an unambiguous set of steps to -->
18+
<!--- reproduce this bug. Include code to reproduce, if relevant -->
19+
1.
20+
2.
21+
3.
22+
4.
23+
24+
## Context
25+
<!--- How has this issue affected you? What are you trying to accomplish? -->
26+
<!--- Providing context helps us come up with a solution that is most useful in the real world -->
27+
28+
## Your Environment
29+
<!--- Include as many relevant details about the environment you experienced the bug in -->
30+
* Version used:
31+
* Browser Name and version:
32+
* Operating System and version (desktop or mobile):

LICENSE

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2017 CodeMode
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

README.md

-7
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,6 @@ You can [view the CodeMode product demo on Youtube](https://youtube.com/watch?v=
4848

4949
- When multiple Youtube videos are open in separate tabs, CodeMode forces each page to reload continuously.
5050

51-
## Contribution guide
52-
53-
- Make an issue (or multiple issues)
54-
- Merge master into the branch before Pull Request to make sure that there are NO conflicts
55-
- Make a Pull Request that references that issue
56-
- Get it code reviewed by someone on the team, address any comments
57-
- Merge into master (with merge commit)
5851

5952
## Style guide
6053

0 commit comments

Comments
 (0)