Skip to content

Commit

Permalink
Merge pull request #3 from primefaces/master
Browse files Browse the repository at this point in the history
pull from primefaces
  • Loading branch information
kojisaiki authored Jun 8, 2017
2 parents ad6a973 + 0637da1 commit 672f3cf
Show file tree
Hide file tree
Showing 885 changed files with 9,550 additions and 6,177 deletions.
68 changes: 68 additions & 0 deletions .angular-cli.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"name": "primeng"
},
"apps": [
{
"root": "src",
"outDir": "dist",
"assets": [
"assets",
"favicon.png"
],
"index": "index.html",
"main": "main.ts",
"polyfills": "polyfills.ts",
"test": "test.ts",
"tsconfig": "tsconfig.app.json",
"testTsconfig": "tsconfig.spec.json",
"prefix": "app",
"styles": [
"styles.css",
"../node_modules/fullcalendar/dist/fullcalendar.min.css",
"../node_modules/quill/dist/quill.snow.css",
"../node_modules/font-awesome/css/font-awesome.min.css"
],
"scripts": [
"../node_modules/jquery/dist/jquery.js",
"../node_modules/moment/moment.js",
"../node_modules/chart.js/dist/Chart.js",
"../node_modules/fullcalendar/dist/fullcalendar.js",
"../node_modules/quill/dist/quill.js",
"../node_modules/prismjs/prism.js",
"../node_modules/prismjs/components/prism-typescript.js"
],
"environmentSource": "environments/environment.ts",
"environments": {
"dev": "environments/environment.ts",
"prod": "environments/environment.prod.ts"
}
}
],
"e2e": {
"protractor": {
"config": "./protractor.conf.js"
}
},
"lint": [
{
"project": "src/tsconfig.app.json"
},
{
"project": "src/tsconfig.spec.json"
},
{
"project": "e2e/tsconfig.e2e.json"
}
],
"test": {
"karma": {
"config": "./karma.conf.js"
}
},
"defaults": {
"styleExt": "css",
"component": {}
}
}
12 changes: 7 additions & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# http://editorconfig.org

# Editor configuration, see http://editorconfig.org
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 4
end_of_line = lf
insert_final_newline = false
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
max_line_length = off
trim_trailing_whitespace = false
80 changes: 49 additions & 31 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,32 +1,50 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/out-tsc
/components
/resources
/aot

# dependencies
node_modules

# generated by compilation
primeng.js
components/**/*.js
showcase/*.js
showcase/demo/**/*.js
showcase/setup/*.js
showcase/theming/*.js
*.map

# production showcase bundle
dist

# distribution resources
resources/**/*.css
resources/images

# type definition
*.d.ts

# aot
aot
components/**/*.metadata.json

# misc
*.log
.DS_STORE
.idea
.vscode
.sass-cache
/node_modules

# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

# misc
/.sass-cache
/connect.lock
/coverage
/libpeerconnection.log
npm-debug.log
testem.log
/typings

# themes
/src/assets/components/themes/**/*.css
/src/assets/components/themes/**/*.map
!/src/assets/components/themes/bootstrap/theme.css

# e2e
/e2e/*.js
/e2e/*.map

# System Files
.DS_Store
Thumbs.db
70 changes: 44 additions & 26 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,35 +1,53 @@
# compiled output
/dist
/tmp
/out-tsc
/aot

# source
src

# test
e2e
karmaconf.js
protractor.conf.js

# dependencies
node_modules

# demo
showcase
index.html
upload.php
# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace
.editor-config

# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

# typescript
*.ts
!*.d.ts

# git
.git
# misc
/.sass-cache
/connect.lock
/coverage
/libpeerconnection.log
npm-debug.log
testem.log
/typings
.gitignore

# config
.angular-cli.json
tsconfig.json
tsconfig-aot.json
webpack.config.js
config
gulpfile.js

# aot
aot

# misc
.github
.vscode
*.log
prod
.editorconfig


tsconfig-release.json
tslint.json

# System Files
.DS_Store
Thumbs.db
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
THE SOFTWARE.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ UI Components for Angular

See [PrimeNG homepage](http://www.primefaces.org/primeng) for live showcase and documentation.

![alt text](http://www.primefaces.org/primeng/showcase/resources/images/primeng-sidebar.svg "PrimeNG")
![alt text](https://www.primefaces.org/primeng/showcase/resources/images/primeng-sidebar.svg "PrimeNG")
131 changes: 0 additions & 131 deletions components/common/api.ts

This file was deleted.

Loading

0 comments on commit 672f3cf

Please sign in to comment.