Skip to content

Commit

Permalink
Merge pull request primefaces#6 in TEDU_COMMON/primeng from feature/v…
Browse files Browse the repository at this point in the history
…ersion4 to develop

* commit 'd7fdfc9ff5707543c0dd0d1e55a0dad5aaddc1f9': (1032 commits)
  FIX: correct path in d.ts. and js file
  Duplicate onSelect event removed(docs)
  Fixed primefaces#4112
  Docs for progress spinner
  strokeWidth and fill properties for ProgressSpinner
  Initial drop-in of new p-progressSpinner component
  Add text
  Fixed primefaces#3460
  Fixed primefaces#4168
  Fixed primefaces#4152
  Add serenity
  Add null check
  Fixed primefaces#4148
  Fixed primefaces#4141
  Validation class in calendar component
  Fixed primefaces#4131
  New dev version
  Set version
  Better fix for primefaces#4103
  Fixed AOT error
  ...
  • Loading branch information
televic-education-ruben committed Oct 20, 2017
2 parents d00fb37 + d7fdfc9 commit 45a31a9
Show file tree
Hide file tree
Showing 978 changed files with 36,330 additions and 12,198 deletions.
69 changes: 69 additions & 0 deletions .angular-cli.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"name": "primeng"
},
"apps": [
{
"root": "src",
"outDir": "dist",
"assets": [
"assets",
"upload.php",
"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": [
"../node_modules/fullcalendar/dist/fullcalendar.min.css",
"../node_modules/quill/dist/quill.snow.css",
"../node_modules/font-awesome/css/font-awesome.min.css",
"styles.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
7 changes: 2 additions & 5 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
<!--
- IF YOU DON'T FILL OUT THE FOLLOWING INFORMATION WE MIGHT CLOSE YOUR ISSUE WITHOUT INVESTIGATING.
- IF YOU'D LIKE TO SECURE OUR RESPONSE, YOU MAY CONSIDER PRIMENG PRO SUPPORT WHERE SUPPORT IS PROVIDED WITHIN 4 hours.
-->
### There is no guarantee in receiving a response in GitHub Issue Tracker, If you'd like to secure our response, you may consider *PrimeNG PRO Support* where support is provided within 4 business hours

**I'm submitting a ...** (check one with "x")
```
Expand All @@ -13,7 +10,7 @@
**Plunkr Case (Bug Reports)**
Please fork the plunkr below and create a case demonstrating your bug report. Issues without a plunkr have much less possibility to be reviewed.

http://plnkr.co/edit/77OG7zX3LToGoidKaKOS
http://plnkr.co/edit/6q5v84DWolH6DeAdi70w?p=preview

**Current behavior**
<!-- Describe how the bug manifests. -->
Expand Down
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
67 changes: 44 additions & 23 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,35 +1,56 @@
# compiled output
/dist
/tmp
/out-tsc
/aot

# source
src

# test
e2e
karma.conf.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-release.json
tsconfig-aot.json
webpack.config.js
config
tslint.json
gulpfile.js

# aot
aot

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



# 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/assets/showcase/images/primeng-sidebar.svg "PrimeNG")
Loading

0 comments on commit 45a31a9

Please sign in to comment.