You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: .github/PULL_REQUEST_TEMPLATE.md
+1-1
Original file line number
Diff line number
Diff line change
@@ -1,4 +1,4 @@
1
-
<!-- Thank you for submitting a pull request! Please make sure you have read the [contribution guidelines](https://github.com/Shopify/draggable/blob/master/CONTRIBUTING.md) before proceeding. -->
1
+
<!-- Thank you for submitting a pull request! Please make sure you have read the [contribution guidelines](https://github.com/Shopify/draggable/blob/main/CONTRIBUTING.md) before proceeding. -->
Copy file name to clipboardExpand all lines: CONTRIBUTING.md
+3-3
Original file line number
Diff line number
Diff line change
@@ -14,7 +14,7 @@ appreciated and encouraged.
14
14
15
15
## Code of Conduct
16
16
17
-
This project and everyone participating in it is governed by the [Code of Conduct document](https://github.com/Shopify/draggable/blob/master/CODE_OF_CONDUCT.md).
17
+
This project and everyone participating in it is governed by the [Code of Conduct document](https://github.com/Shopify/draggable/blob/main/CODE_OF_CONDUCT.md).
@@ -29,11 +29,11 @@ please open a new issue with labels: `bug`, `documentation`, `feature-request` o
29
29
Pull requests are more than welcome! Just make sure that to include a description of the problem and how you are attempting to fix the issue, or
30
30
simply follow the Pull Request description template.
31
31
32
-
We also require Pull Requests to sync with master via rebase (not merge). So when you need to sync up your branch with master use: `git pull --rebase origin master`,
32
+
We also require Pull Requests to sync with main via rebase (not merge). So when you need to sync up your branch with main use: `git pull --rebase origin main`,
33
33
or if you need to sync up with another branch `git pull --rebase origin some-other-branch-name`. Doing so will remove of an extra merge commit in the git history.
34
34
This will also require a force push to the branch, e.g. `git push -u origin +some-branch`. The `+` in the last command indicates that you are force pushing changes.
35
35
36
-
Additionally we require commits to be atomic and squashed where needed. This will keep the git history clean on master. To squash commits use the `git rebase -i @~2`
36
+
Additionally we require commits to be atomic and squashed where needed. This will keep the git history clean on main. To squash commits use the `git rebase -i @~2`
37
37
command to do an interactive rebase. This will allow you to merge multiple commits into one. To read up more on this please visit: [Git Tools Rewriting History](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History)
@@ -40,59 +38,64 @@ interface, for more information read the documentation below.
40
38
41
39
## Install
42
40
43
-
**NOTE**: When installing with npm or yarn, `@shopify/[email protected]` will be installed by default. If you want to install the latest version, please install `@shopify/[email protected]` or `@shopify/draggable@next`.
Draggable includes [TypeScript](http://typescriptlang.org) definitions.
135
136
@@ -139,7 +140,7 @@ Draggable includes [TypeScript](http://typescriptlang.org) definitions.
139
140
140
141
To run the `examples` project locally, simply run the following from the `draggable` root:
141
142
142
-
```
143
+
```bash
143
144
yarn && yarn start
144
145
```
145
146
@@ -150,11 +151,7 @@ changes from both `src/` and `examples/src` and reloads the browser.
150
151
151
152
Contributions are more than welcome, the code base is still new and needs more love.
152
153
153
-
For more information, please checkout the [contributing document](https://github.com/Shopify/draggable/blob/master/CONTRIBUTING.md).
154
-
155
-
## Roadmap
156
-
157
-
We are currently working on `v1.0.0-beta.12`. Check out the [project board](https://github.com/Shopify/draggable/projects/3) to see tasks and follow progress on the release. Any Pull Requests should be pointed against the feature branch `v1.0.0-beta.12`.
154
+
For more information, please checkout the [contributing document](https://github.com/Shopify/draggable/blob/main/CONTRIBUTING.md).
158
155
159
156
## Related resources
160
157
@@ -163,4 +160,4 @@ We are currently working on `v1.0.0-beta.12`. Check out the [project board](http
163
160
164
161
## Copyright
165
162
166
-
Copyright (c) 2018 Shopify. See LICENSE.md for further details.
163
+
Copyright (c) 2018-present Shopify. See LICENSE.md for further details.
Copy file name to clipboardExpand all lines: examples/src/components/Sidebar/Sidebar.html
+1-1
Original file line number
Diff line number
Diff line change
@@ -11,7 +11,7 @@
11
11
<footerclass="SidebarFooter">
12
12
<pclass="LegalText"><ahref="https://shopify.github.io/draggable/" class="Link Link--typeDark" title="Visit Draggable JS">draggable.js</a> was developed by <ahref="https://github.com/tsov" class="Link Link--noWrap" title="Github: tsov">Max Hoffmann</a> and <ahref="https://github.com/beefchimi" class="Link Link--noWrap" title="Github: beefchimi">Curtis Dulmage</a>.</p>
13
13
14
-
<pclass="LegalText">Draggable is released under the <ahref="https://github.com/Shopify/shopify.github.com/blob/master/LICENSE.md" class="Link Link--noWrap" title="View MIT License" target="_blank" rel="noopener">MIT license</a>. You are free to use the code from this library for both personal and commercial use.</p>
14
+
<pclass="LegalText">Draggable is released under the <ahref="https://github.com/Shopify/shopify.github.com/blob/main/LICENSE.md" class="Link Link--noWrap" title="View MIT License" target="_blank" rel="noopener">MIT license</a>. You are free to use the code from this library for both personal and commercial use.</p>
15
15
16
16
<pclass="preload-cursors"><b>Special thanks</b><u>to all of our</u><ahref="https://github.com/Shopify/draggable/graphs/contributors" title="We love our contributors!">amazing contributors</a>.</p>
0 commit comments