-
Notifications
You must be signed in to change notification settings - Fork 49
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #284 from PhileCMS/develop
Develop
- Loading branch information
Showing
96 changed files
with
5,770 additions
and
4,788 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,14 @@ | ||
# EditorConfig is awesome: http://EditorConfig.org | ||
|
||
# top-most EditorConfig file | ||
root = true | ||
charset = utf-8 | ||
# Get rid of whitespace to avoid diffs with a bunch of EOL changes | ||
trim_trailing_whitespace = true | ||
|
||
# Unix-style newlines with a newline ending every file | ||
[*] | ||
charset = utf-8 | ||
end_of_line = lf | ||
indent_style = space | ||
indent_size = 2 | ||
trim_trailing_whitespace = true | ||
insert_final_newline = true | ||
|
||
# Tab indentation | ||
[*.js] | ||
indent_style = tab | ||
indent_size = 4 | ||
|
||
# Indentation for PHP files | ||
[*.php] | ||
indent_style = tab | ||
indent_size = 4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
## Contributing | ||
|
||
Help make PhileCMS better by checking out the GitHub repository and submitting pull requests. | ||
|
||
Fork and make pull requests to the `develop` branch. | ||
|
||
[See Phile wiki for detailed info.](https://github.com/PhileCMS/Phile/wiki/%5BDEVELOPER%5D-Developer-Guidelines) | ||
|
||
If you create a plugin please add it to the [Plugin Wiki](https://github.com/PhileCMS/Phile/wiki/%5BCOMMUNITY%5D-Plugins). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
Please report your issue with the following information: | ||
|
||
### Excpected behavior | ||
|
||
### Actual behavior | ||
|
||
### Steps to reproduce the behavior | ||
|
||
### Additional information |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
[TASK|BUGFIX|FEATURE] A meaningfull first line of your pull request | ||
|
||
Fixes: # . | ||
|
||
Changes proposed in this pull request: | ||
|
||
|
||
@PhileCMS/Phile please review this pull request |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.