1
0
mirror of https://github.com/flarum/core.git synced 2025-08-11 10:55:47 +02:00

Merge pull request #10 from maelsoucaze/comments

Comment the code (and add SVG LF support)
This commit is contained in:
Toby Zerner
2015-10-19 19:08:04 +10:30
3 changed files with 26 additions and 7 deletions

View File

@@ -1,7 +1,12 @@
# EditorConfig makes it easy to maintain the correct coding style
# when switching between different text editors and projects.
# http://editorconfig.org/ # http://editorconfig.org/
# Top-most EditorConfig file. Do not search in parent directories.
root = true root = true
# Set two space indentation, line endings to Unix (LF) with a final newline,
# default charset to UTF-8, and trim trailing whitespace in all files.
[*] [*]
indent_style = space indent_style = space
indent_size = 2 indent_size = 2
@@ -10,8 +15,10 @@ charset = utf-8
trim_trailing_whitespace = true trim_trailing_whitespace = true
insert_final_newline = true insert_final_newline = true
# Set four space indentation in JSON and PHP files.
[*.{json,php}] [*.{json,php}]
indent_size = 4 indent_size = 4
# Do not trim trailing whitespace in Markdown files.
[*.md] [*.md]
trim_trailing_whitespace = false trim_trailing_whitespace = false

View File

@@ -1,20 +1,25 @@
# Automatically normalize line endings for all text-based files # The gitattributes file is a simple text file that gives
# attributes to pathnames.
# http://git-scm.com/docs/gitattributes
# Automatically normalize line endings for all text-based files.
# http://git-scm.com/docs/gitattributes#_end_of_line_conversion # http://git-scm.com/docs/gitattributes#_end_of_line_conversion
* text=auto * text=auto
# For the following file types, normalize line endings to LF on # For the following file types, normalize line endings to LF on check
# check in and prevent conversion to CRLF when they are checked out # in and prevent conversion to CRLF when they are checked out (this
# (this is required in order to prevent newline related issues like, # is required in order to prevent newline related issues like, for
# for example, after the build script is run) # example, after the build script is run).
.* text eol=lf .* text eol=lf
*.js text eol=lf *.js text eol=lf
*.json text eol=lf *.json text eol=lf
*.md text eol=lf *.md text eol=lf
*.php text eol=lf *.php text eol=lf
*.svg text eol=lf
*.yml text eol=lf *.yml text eol=lf
# Exclude the following files when exporting an archive # Exclude the following files when exporting an archive.
# https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes#Exporting-Your-Repository # http://git-scm.com/docs/gitattributes#_creating_an_archive
.editorconfig export-ignore .editorconfig export-ignore
.gitattributes export-ignore .gitattributes export-ignore
.gitignore export-ignore .gitignore export-ignore

View File

@@ -1,4 +1,11 @@
# The .gitignore file specifies intentionally untracked files that
# Git should ignore. Files already tracked by Git are not affected.
# http://git-scm.com/docs/gitignore
# Composer
/vendor /vendor
composer.phar composer.phar
# Operating systems
.DS_Store .DS_Store
Thumbs.db Thumbs.db