Skip to content

Commit

Permalink
Merge branch 'lineup-v4' into sgratzl/fix_data_mapping
Browse files Browse the repository at this point in the history
  • Loading branch information
sgratzl committed Apr 14, 2020
2 parents 094e7b3 + 4f977d8 commit 9f5598c
Show file tree
Hide file tree
Showing 8 changed files with 63 additions and 22 deletions.
16 changes: 8 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ jobs:
- checkout
- restore_cache:
keys:
- v2-deps-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
- v2-deps-{{ checksum "package.json" }}
- v2-deps-
- v3-deps-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
- v3-deps-{{ checksum "package.json" }}
- v3-deps-
- run: npm ci
- save_cache:
key: v2-deps-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
key: v3-deps-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
paths:
- ~/.npm
- ~/.cache
Expand Down Expand Up @@ -52,12 +52,12 @@ jobs:
- checkout
- restore_cache:
keys:
- v2-deps-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
- v2-deps-{{ checksum "package.json" }}
- v2-deps-
- v3-deps-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
- v3-deps-{{ checksum "package.json" }}
- v3-deps-
- run: npm ci
- save_cache:
key: v2-deps-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
key: v3-deps-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
paths:
- ~/.npm
- ~/.cache
Expand Down
23 changes: 18 additions & 5 deletions .github/ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE/bug.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,29 @@
* Release number or git hash:
* Web browser version and OS:
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: 'type: bug'
assignees: ''

---

* Release number or git hash:
* Web browser version and OS:

### Steps to reproduce

1.
1.
1.
2.

### Observed behavior
<!--
* Any unexpected output or action (or lack of expected output or action)
* Web browser console errors (including tracebacks)
* Server errors (relevant messages and tracebacks)
* Static or animated images showing the UI behavior
-->

### Expected behavior
*

*

8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
name: feature request
about: Suggest a feature to be implemented or a component to be improved
title: ''
labels: 'type: feature'
assignees: ''

---
9 changes: 9 additions & 0 deletions .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
name: question
about: Ask question about the library (usage, features,...)
title: ''
labels: 'type: question'
assignees: ''

---

13 changes: 7 additions & 6 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
closes <list issues here>
Closes <list issues here>

**prerequisites**:
* [ ] branch is up-to-date with the branch to be merged with, i.e. develop
* [ ] build is successful
* [ ] code is cleaned up and formatted
* [ ] tested with Firefox 52, Firefox 57+, Chrome 64+, MS Edge 16+
**Prerequisites**:

* [ ] Branch is up-to-date with the branch to be merged with, i.e. develop
* [ ] Build is successful
* [ ] Code is cleaned up and formatted
* [ ] Tested with Firefox ESR, latest Firefox, latest Chrome, Edge 18


### Summary
Expand Down
3 changes: 3 additions & 0 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
tasks:
- init: npm install
command: npm run start
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,12 @@ LineUp.js depends on
Development Environment
-----------------------
Try the Gitpod online IDE and start coding instantly in your browser.
[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/lineupjs/lineupjs)
Otherwise follow the steps to setup a local development environment.
**Installation**
```bash
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,11 @@
"*.css"
],
"browserslist": [
"Firefox >= 57",
"Firefox ESR",
"Edge >= 16",
"Chrome >= 64"
"last 2 Firefox versions",
"last 2 Chrome versions",
"last 2 Edge versions",
"Edge 18"
],
"files": [
"build",
Expand Down

0 comments on commit 9f5598c

Please sign in to comment.