From ac673f8affc41b11623bc76a45230f83ee7326dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Verest=20=E4=BC=9F=E4=BF=9D=E7=BD=97?= Date: Fri, 10 May 2013 14:49:53 +0800 Subject: [PATCH 1/6] #### Update forked project --- README.md | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c41fd5bf..a4b0039d 100644 --- a/README.md +++ b/README.md @@ -135,7 +135,13 @@ Is expected together with Node.js 1.0 ## Developing -Before starting development, please do +### First tiny steps + +1. Register & login within [GitHub](https://github.com/Nodeclipse) +2. Add stars to the projects, that you like +3. Fork to your account, play with code + +### Before starting development, please do 1. Carefully read materials 2. Install and give thorough try @@ -151,7 +157,7 @@ In Eclipse for Java or RCP developers 1. Copy to clipboard git repository URL: https://github.com/Nodeclipse/nodeclipse-1.git 2. File -> Import.. -> Git / Project from git -#### Other way +##### Other way, not recommended way 1. git clone https://github.com/Nodeclipse/nodeclipse-1.git 2. [Download Eclipse](http://www.eclipse.org/downloads/) @@ -162,12 +168,29 @@ In Eclipse for Java or RCP developers Select Projects with source folders --> +#### Update forked project + +If you forked into your account, after a while it is possible that code at original repository was updated. + +With git command line you need to open project base folder, then + + + git remote add upstream https://github.com/Nodeclipse/project-you-forked.git + git fetch upstream + git merge upstream/master + git push origin master + + +With EGit you should do the same steps but within GUI. + ### Code standard 1. If you edited or created file, add yourself as @author in JavaDoc or comments 2. Import CodeStyle_codetemplates.xml; instructions are inside the xml file. This will add @author in new files automatically. Use Ctrl+Alt+J to quickly insert in existing files. +### Send Pull Request + ### Testing Developers may try latest unreleased version at update URL: From 5aa9c85e74e70afd0b5c1a0f13fc4643265a20d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Verest=20=E4=BC=9F=E4=BF=9D=E7=BD=97?= Date: Fri, 10 May 2013 14:51:23 +0800 Subject: [PATCH 2/6] ### Send Pull Request --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index a4b0039d..c38ce98c 100644 --- a/README.md +++ b/README.md @@ -168,7 +168,13 @@ In Eclipse for Java or RCP developers Select Projects with source folders --> -#### Update forked project +### Code standard + +1. If you edited or created file, add yourself as @author in JavaDoc or comments +2. Import CodeStyle_codetemplates.xml; instructions are inside the xml file. + This will add @author in new files automatically. Use Ctrl+Alt+J to quickly insert in existing files. + +### Update forked project If you forked into your account, after a while it is possible that code at original repository was updated. @@ -183,12 +189,6 @@ With git command line you need to open project base folder, then With EGit you should do the same steps but within GUI. -### Code standard - -1. If you edited or created file, add yourself as @author in JavaDoc or comments -2. Import CodeStyle_codetemplates.xml; instructions are inside the xml file. - This will add @author in new files automatically. Use Ctrl+Alt+J to quickly insert in existing files. - ### Send Pull Request ### Testing From 335e0212ab1716961c84aba015bbb43ebff88e0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Verest=20=E4=BC=9F=E4=BF=9D=E7=BD=97?= Date: Fri, 10 May 2013 14:57:05 +0800 Subject: [PATCH 3/6] ### Send Pull Request steps --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c38ce98c..363de5ab 100644 --- a/README.md +++ b/README.md @@ -189,7 +189,13 @@ With git command line you need to open project base folder, then With EGit you should do the same steps but within GUI. -### Send Pull Request +### Send Pull Request steps + +1. Push to your remote origin (your account) +2. Open GitHub page for your fork +3. Press Pull Request +4. Review Commits on Commits tab +5. Write description, press Send pull request ### Testing From 840cc1c9866b48ba7c90beb1953e2cd746f69be5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Verest=20=E4=BC=9F=E4=BF=9D=E7=BD=97?= Date: Fri, 10 May 2013 15:01:28 +0800 Subject: [PATCH 4/6] clean-up --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 363de5ab..3e3393a5 100644 --- a/README.md +++ b/README.md @@ -180,12 +180,14 @@ If you forked into your account, after a while it is possible that code at origi With git command line you need to open project base folder, then +
 
 	git remote add upstream https://github.com/Nodeclipse/project-you-forked.git  
 	git fetch upstream  
 	git merge upstream/master   
 	git push origin master  
 
+
With EGit you should do the same steps but within GUI. @@ -193,9 +195,9 @@ With EGit you should do the same steps but within GUI. 1. Push to your remote origin (your account) 2. Open GitHub page for your fork -3. Press Pull Request +3. Press Pull Request 4. Review Commits on Commits tab -5. Write description, press Send pull request +5. Write description, press Send pull request ### Testing From d1fdcbf8cef5ac3b68272218ec918c4608dafd5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Verest=20=E4=BC=9F=E4=BF=9D=E7=BD=97?= Date: Fri, 10 May 2013 15:03:10 +0800 Subject: [PATCH 5/6] clean-up2 --- README.md | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 3e3393a5..607626fe 100644 --- a/README.md +++ b/README.md @@ -180,20 +180,18 @@ If you forked into your account, after a while it is possible that code at origi With git command line you need to open project base folder, then -
-
-	git remote add upstream https://github.com/Nodeclipse/project-you-forked.git  
-	git fetch upstream  
-	git merge upstream/master   
-	git push origin master  
-
-
+

+git remote add upstream https://github.com/Nodeclipse/project-you-forked.git  
+git fetch upstream  
+git merge upstream/master   
+git push origin master  
+
With EGit you should do the same steps but within GUI. ### Send Pull Request steps -1. Push to your remote origin (your account) +1. Push to your remote origin (your account) 2. Open GitHub page for your fork 3. Press Pull Request 4. Review Commits on Commits tab From 22dc99d6d7d944324a1e8f7c6747e5a5c291e166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Verest=20=E4=BC=9F=E4=BF=9D=E7=BD=97?= Date: Fri, 10 May 2013 15:55:26 +0800 Subject: [PATCH 6/6] #29 add MarkdownPreview to Node perspective --- org.nodeclipse.ui/plugin.xml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/org.nodeclipse.ui/plugin.xml b/org.nodeclipse.ui/plugin.xml index 76f64bad..09acb644 100644 --- a/org.nodeclipse.ui/plugin.xml +++ b/org.nodeclipse.ui/plugin.xml @@ -16,7 +16,7 @@ name="Node Project" project="true"> - Create a new Node.js project + Create a new Node.js project (or add .project file to existing project) - Create a new Node.js project with Express.js framework + Create a new Node.js project with Express.js framework (Express should be installed before with npm install -g express) - + - + + +