Skip to content

Commit

Permalink
Merge pull request #1 from primefaces/master
Browse files Browse the repository at this point in the history
Resync Master
  • Loading branch information
davisb10 authored Jul 2, 2019
2 parents b3e3c45 + cc0d054 commit 12e9313
Show file tree
Hide file tree
Showing 1,013 changed files with 95,089 additions and 27,250 deletions.
69 changes: 0 additions & 69 deletions .angular-cli.json

This file was deleted.

2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Editor configuration, see http://editorconfig.org
# Editor configuration, see https://editorconfig.org
root = true

[*]
Expand Down
21 changes: 16 additions & 5 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
### There is no guarantee in receiving an immediate 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
If you have a PrimeNG PRO Support subscription please post your issue at;

https://pro.primefaces.org

where our team will respond within 4 business hours.

If you do not have a PrimeNG PRO Support subscription, fill-in the report below. Please note that
your issue will be added to the waiting list of community issues and will be reviewed on a first-come first-serve basis, as a result, the support team is unable to guarantee a specific schedule on when it will be reviewed. Thank you for your understanding.

Current Queue Time for Review
Without PRO Support: ~8-12 weeks.
With PRO Support: 1 hour

**I'm submitting a ...** (check one with "x")
```
Expand All @@ -8,9 +19,9 @@
```

**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.
Please demonstrate your case at stackblitz by using the issue template below. Issues without a test case have much less possibility to be reviewd in detail and assisted.

http://plnkr.co/edit/Nxca3ovCbtvx9kpGds0q?p=preview
https://stackblitz.com/github/primefaces/primeng-issue-template

**Current behavior**
<!-- Describe how the bug manifests. -->
Expand All @@ -31,10 +42,10 @@ https://plnkr.co or similar (you can use this template as a starting point: http
**Please tell us about your environment:**
<!-- Operating system, IDE, package manager, HTTP server, ... -->

* **Angular version:** 2.0.X
* **Angular version:** 5.X
<!-- Check whether this is still an issue in the most recent Angular version -->

* **PrimeNG version:** 2.0.X
* **PrimeNG version:** 5.X
<!-- Check whether this is still an issue in the most recent Angular version -->

* **Browser:** [all | Chrome XX | Firefox XX | IE XX | Safari XX | Mobile Chrome XX | Android X.X Web Browser | iOS XX Safari | iOS XX UIWebView | iOS XX WKWebView ]
Expand Down
3 changes: 1 addition & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@
When submitting a PR, please also create an issue documenting the error.

###Feature Requests
Due to company policy, we are unable to accept feature request PRs with significant changes as such cases has to be implemented by our team following our own processes.
Smaller scaled feature implementations such as adding a property to a component will be considered for merging.
Due to company policy, we are unable to accept feature request PRs with significant changes as such cases has to be implemented by our team following our own processes.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ testem.log
/src/assets/components/themes/**/*.css
/src/assets/components/themes/**/*.map
!/src/assets/components/themes/bootstrap/theme.css
!/src/assets/components/themes/nova-*/theme.css
!/src/assets/components/themes/luna-*/theme.css
!/src/assets/components/themes/rhea/theme.css

# e2e
/e2e/*.js
Expand Down
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ exports

# config
.angular-cli.json
angular.json
tsconfig.json
tsconfig-release.json
tsconfig-aot.json
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ before_install:
- sh -e /etc/init.d/xvfb start

script: # the build step
- node_modules/.bin/ng test --colors=false --progress=false --single-run
- node_modules/.bin/ng test --watch=false


cache:
yarn: true
directories:
- ./node_modules
- ./.chrome/chromium
- ./.chrome/chromium
2 changes: 2 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{
}
Loading

0 comments on commit 12e9313

Please sign in to comment.