Skip to content

Fix/rebase #11

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.

Sign up for GitHub

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

Open
wants to merge 12 commits into
base: develop
Choose a base branch
from
Open

Fix/rebase #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3e6ce08
Changed @license to GPL3+.
MelParker Apr 29, 2019
3afe8d2
CHanged the license file to GPL3+.
MelParker Apr 29, 2019
9488ea4
As per request, changed to GPL -3.0+.
MelParker Apr 29, 2019
ed8e954
Changed license to GPL3 (PR #1)
MelParker Apr 29, 2019
0e06766
Updated the README.
MelParker Apr 29, 2019
f216e6c
Fixed the bootstrap DocBlock.
MelParker Apr 29, 2019
5341bff
Merge pull request #2 from MelParker/fix/merge
MelParker Apr 29, 2019
7e10f0a
Continued to improve README.
MelParker Apr 29, 2019
fa96125
Continued to improve README.
MelParker Apr 29, 2019
79dd765
Improved the bootstrap DocBlock.
MelParker Apr 29, 2019
9f41e55
Merge pull request #3 (test/merge)
MelParker Apr 29, 2019
375e06a
Fixed the descriptions.
MelParker Apr 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
935 changes: 619 additions & 316 deletions LICENSE.md
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@

> An awesome collaborative project to teach you the contributor workflow.

This repository is for the [Git Contributing](https://knowthecode.io/labs/git-contributing) hands-on coding lab.
This repository is for the [Git Contribut

I am testing the merge update strategy.

I am continuing to work on this file.
4 changes: 2 additions & 2 deletions bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Launches the Git Contributing plugin.
* Launches the Git Contributing plugin for you to enjoy while learning about git.
*
* @package KnowTheCode\GitContributing
* @author hellofromTonya
Expand All @@ -9,7 +9,7 @@
* @wordpress-plugin
* Plugin Name: Git Contributing
* Plugin URI: https://github.com/KnowTheCode/git-contributing
* Description: Git Contributing - an awesome collaborative project to teach you the contributor workflow.
* Description: An awesome collaborative project to teach you the contributor workflow.
* Version: 1.0.0
* Author: Git Contributing Team
* Author URI: https://KnowTheCode.io
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "knowthecode/git-contributing",
"description": "Git Contributing - an awesome collaborative project to teach you the contributor workflow.",
"description": "An awesome collaborative project to teach you the contributor workflow.",
"type": "wordpress-plugin",
"license": "GPL-2.0+",
"support": {
Expand Down
2 changes: 1 addition & 1 deletion src/asset/handler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @since 1.0.0
* @author Git Contributing Team
* @link https://knowthecode.io
* @license GNU-2.0+
* @license GPL-3.0+
*/

namespace KnowTheCode\GitContributing\Asset;
Expand Down
2 changes: 1 addition & 1 deletion tests/php/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @package KnowTheCode\GitContributing\Tests\PHP
* @since 1.0.0
* @link https://github.com/KnowTheCode/git-contributing
* @license GNU-2.0+
* @license GPL-3.0+
*/

namespace KnowTheCode\GitContributing\Tests\PHP;
Expand Down
2 changes: 1 addition & 1 deletion tests/php/integration/bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @package KnowTheCode\GitContributing\Tests\PHP\Integration
* @since 1.0.0
* @link https://github.com/KnowTheCode/git-contributing
* @license GNU-2.0+
* @license GPL-3.0+
*/

namespace KnowTheCode\GitContributing\Tests\PHP\Integration;
Expand Down
2 changes: 1 addition & 1 deletion tests/php/integration/class-test-case.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @package KnowTheCode\GitContributing\Tests\PHP\Integration
* @since 1.0.0
* @link https://github.com/KnowTheCode/git-contributing
* @license GNU-2.0+
* @license GPL-3.0+
*/

namespace KnowTheCode\GitContributing\Tests\PHP\Integration;
Expand Down
2 changes: 1 addition & 1 deletion tests/php/integration/sampleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @package KnowTheCode\GitContributing\Tests\PHP\Integration
* @since 1.0.0
* @link https://github.com/KnowTheCode/git-contributing
* @license GNU-2.0+
* @license GPL-3.0+
*/

namespace KnowTheCode\GitContributing\Tests\PHP\Integration;
Expand Down
2 changes: 1 addition & 1 deletion tests/php/test-case-trait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @package KnowTheCode\GitContributing\Tests\PHP
* @since 1.0.0
* @link https://github.com/KnowTheCode/git-contributing
* @license GNU-2.0+
* @license GPL-3.0+
*/

namespace KnowTheCode\GitContributing\Tests\PHP;
Expand Down
2 changes: 1 addition & 1 deletion tests/php/unit/bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @package KnowTheCode\GitContributing\Tests\PHP\Unit
* @since 1.0.0
* @link https://github.com/KnowTheCode/git-contributing
* @license GNU-2.0+
* @license GPL-3.0+
*/

namespace KnowTheCode\GitContributing\Tests\PHP\Unit;
Expand Down
2 changes: 1 addition & 1 deletion tests/php/unit/class-test-case.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @package KnowTheCode\GitContributing\Tests\PHP\Unit
* @since 1.0.0
* @link https://github.com/KnowTheCode/git-contributing
* @license GNU-2.0+
* @license GPL-3.0+
*/

namespace KnowTheCode\GitContributing\Tests\PHP\Unit;
Expand Down
2 changes: 1 addition & 1 deletion tests/php/unit/sampleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @package KnowTheCode\GitContributing\Tests\PHP\Unit
* @since 1.0.0
* @link https://github.com/KnowTheCode/git-contributing
* @license GNU-2.0+
* @license GPL-3.0+
*/

namespace KnowTheCode\GitContributing\Tests\PHP\Unit;
Expand Down