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: contributing/backoffice-project/contributing.md
+4-4Lines changed: 4 additions & 4 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -4,12 +4,12 @@
4
4
5
5
In the high probability that you are porting something from angular JS then here are a few helpful tips for using Lit:
6
6
7
-
Here is the LIT documentation and playground: [https://lit.dev](https://lit.dev)
7
+
Here is the Lit documentation and playground: [https://lit.dev](https://lit.dev)
8
8
9
9
### How best to find what needs converting from the old backoffice?
10
10
11
11
1. Navigate to [https://github.com/umbraco/Umbraco-CMS](https://github.com/umbraco/Umbraco-CMS)
12
-
2. Make sure you are on the `contrib` branch
12
+
2. Make sure you are on the `main` branch
13
13
14
14
### What is the process of contribution?
15
15
@@ -34,11 +34,11 @@ The frontend has an API formatter that takes the OpenAPI schema file and convert
34
34
35
35
### Caveats
36
36
37
-
The backoffice can be ran and tested against a real Umbraco instance by cloning down the Umbraco-CMS `contrib` branch, but there are no guarantees about how well it works yet.
37
+
The backoffice can be ran and tested against a real Umbraco instance by cloning down the Umbraco-CMS `main` branch, but there are no guarantees about how well it works yet.
Copy file name to clipboardExpand all lines: contributing/umbraco-cms/contributing.md
+3-3Lines changed: 3 additions & 3 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -30,7 +30,7 @@ The following steps are a quick-start guide:
30
30
{% embed url="https://youtu.be/LPmyTcIXzAs" %}
31
31
32
32
3.**Switch to the correct branch**\
33
-
Switch to the `contrib` branch
33
+
Switch to the `main` branch
34
34
4.**Build**
35
35
36
36
Build your fork of Umbraco locally as shown in the video below. You can build with any IDE that supports dotnet or the command line.
@@ -42,15 +42,15 @@ The following steps are a quick-start guide:
42
42
{% embed url="https://youtu.be/sWetLj4PGQI" %}
43
43
44
44
5.**Branch**\
45
-
Create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp/12345`. This means it's a temporary branch for the particular issue you're working on, in this case issue number `12345`. Don't commit to `contrib`, create a new branch first.
45
+
Create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp/12345`. This means it's a temporary branch for the particular issue you're working on, in this case issue number `12345`. Don't commit to `main`, create a new branch first.
46
46
6.**Change**
47
47
48
48
Make your changes, experiment, have fun, explore and learn, and don't be afraid. We welcome all contributions and will [happily give feedback](first-issue.md#questions).
49
49
7.**Commit and push**
50
50
51
51
Done? Yay! 🎉
52
52
53
-
Remember to commit to your new `temp` branch, and don't commit to `contrib`. Then you can push the changes up to your fork on GitHub.
53
+
Remember to commit to your new `temp` branch, and don't commit to `main`. Then you can push the changes up to your fork on GitHub.
54
54
8.**Create pull request**
55
55
56
56
On GitHub, in your forked repository (`https://github.com/[YourUsername]/Umbraco-CMS`) you will see a banner saying that you pushed a new branch and a button to make a pull request. Tap the button and follow the instructions.
Copy file name to clipboardExpand all lines: contributing/umbraco-cms/creating-a-pr.md
+5-5Lines changed: 5 additions & 5 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -7,10 +7,10 @@ We recommend you to [sync with our repository][sync fork] before you submit your
7
7
GitHub will have picked up on the new branch you've pushed and will offer to create a Pull Request. Click that green button and away you go.
8
8

9
9
10
-
We like to use [git flow][git flow] as much as possible, but don't worry if you are not familiar with it. The most important thing you need to know is that when you fork the Umbraco repository, the default branch is set to `contrib`. This is the branch you should be targeting.
10
+
We like to use [git flow][git flow] as much as possible, but don't worry if you are not familiar with it. The most important thing you need to know is that when you fork the Umbraco repository, the default branch is set to `main`. This is the branch you should be targeting.
11
11
12
12
Please note: we are no longer accepting features for v8 and below but will continue to merge security fixes as and when they arise.
13
-
13
+
14
14
## The review process
15
15
[review process]: #the-review-process
16
16
@@ -35,9 +35,9 @@ If you make the corrections we ask for in the same branch and push them to your
35
35
36
36
We understand you have other things to do and can't just drop everything to help us out.
37
37
38
-
So if we’re asking for your help to improve the PR we’ll wait for two weeks to give you a fair chance to make changes. We’ll ask for an update if we don’t hear back from you after that time.
38
+
So if we’re asking for your help to improve the PR we’ll wait for two weeks to give you a fair chance to make changes. We’ll ask for an update if we don’t hear back from you after that time.
39
39
40
-
If we don’t hear back from you for 4 weeks, we’ll close the PR so that it doesn’t just hang around forever. You’re very welcome to re-open it once you have some more time to spend on it.
40
+
If we don’t hear back from you for 4 weeks, we’ll close the PR so that it doesn’t just hang around forever. You’re very welcome to re-open it once you have some more time to spend on it.
41
41
42
42
There will be times that we really like your proposed changes and we’ll finish the final improvements we’d like to see ourselves. You still get the credits and your commits will live on in the git repository.
43
43
@@ -48,4 +48,4 @@ There will be times that we really like your proposed changes and we’ll finish
Copy file name to clipboardExpand all lines: contributing/umbraco-cms/first-issue.md
+12-12Lines changed: 12 additions & 12 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -11,26 +11,26 @@ Great question! The short version goes like this:
11
11
1.**Fork**
12
12
13
13
Create a fork of [`Umbraco-CMS` on GitHub][Umbraco CMS repo]
14
-
14
+
15
15

16
-
16
+
17
17
1.**Clone**
18
18
19
19
When GitHub has created your fork, you can clone it in your favorite Git tool
20
-
21
-

22
-
20
+
21
+

22
+
23
23
1.**Switch to the correct branch**
24
24
25
-
Switch to the `contrib` branch
25
+
Switch to the `main` branch
26
26
27
27
1.**Build**
28
28
29
29
Build your fork of Umbraco locally as described in the build documentation: you can [debug with Visual Studio Code][build - debugging with code] or [with Visual Studio][build - debugging with vs].
30
30
31
31
1.**Branch**
32
32
33
-
Create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp-12345`. This means it's a temporary branch for the particular issue you're working on, in this case issue number `12345`. Don't commit to `contrib`, create a new branch first.
33
+
Create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp-12345`. This means it's a temporary branch for the particular issue you're working on, in this case issue number `12345`. Don't commit to `main`, create a new branch first.
34
34
35
35
1.**Change**
36
36
@@ -40,7 +40,7 @@ Great question! The short version goes like this:
40
40
41
41
Done? Yay! 🎉
42
42
43
-
Remember to commit to your new `temp` branch, and don't commit to `contrib`. Then you can push the changes up to your fork on GitHub.
43
+
Remember to commit to your new `temp` branch, and don't commit to `main`. Then you can push the changes up to your fork on GitHub.
44
44
45
45
#### Keeping your Umbraco fork in sync with the main repository
0 commit comments