Skip to content

Commit 02dfc2d

Browse files
authored
Merge pull request #1 from parse-community/master
1.3.1同步
2 parents 43acc81 + 5b90d9e commit 02dfc2d

21 files changed

+5879
-7190
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@ npm-debug.log
1111
*.swp
1212
.env
1313
.idea/
14+
15+
logs/
16+
test_logs

.travis.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
11
language: node_js
22
node_js:
33
- '10.14'
4+
5+
branches:
6+
only:
7+
- master
8+
- /^greenkeeper/.*$/
9+
- /^v?[0-9]+.[0-9]+.[0-9]+(-.*)?$/
10+
11+
cache:
12+
directories:
13+
- "$HOME/.npm"
14+
415
before_install:
516
- npm install -g greenkeeper-lockfile@1
6-
before_script:
17+
before_script:
718
- ./scripts/before_script.sh
819
- greenkeeper-lockfile-update
920
after_script:

CHANGELOG.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
## Parse Dashboard Changelog
2-
* _Contributing to this repo? Add info about your change here to be included in next release_
32

43
### master
5-
[Full Changelog](https://github.com/parse-community/parse-dashboard/compare/1.3.0...master)
4+
[Full Changelog](https://github.com/parse-community/parse-dashboard/compare/1.3.1...master)
5+
6+
* _Contributing to this repo? Add info about your change here to be included in next release_
7+
8+
### 1.3.1
9+
[Full Changelog](https://github.com/parse-community/parse-dashboard/compare/1.3.0...1.3.1)
10+
11+
* FIX: Correct inappropriate error message when no target audience is selected ([#1052](https://github.com/parse-community/parse-dashboard/pull/1051)), thanks to [Bouimadaghene](https://github.com/starbassma)
12+
* FIX: issue regarding lost mount path ([#1070](https://github.com/parse-community/parse-dashboard/pull/1070)), thanks to [Diamond Lewis](https://github.com/dplewis)
13+
* NEW: Add distinct / unique filter ([#920](https://github.com/parse-community/parse-dashboard/pull/920)), thanks to [Diamond Lewis](https://github.com/dplewis)
614

715
### 1.3.0
816
[Full Changelog](https://github.com/parse-community/parse-dashboard/compare/1.2.0...1.3.0)

Parse-Dashboard/parse-dashboard-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"apps": [{
3-
"serverURL": "http://localhost:1337/parse",
3+
"serverURL": "http://localhost:1338/parse",
44
"appId": "hello",
55
"masterKey": "world",
66
"appName": "",

0 commit comments

Comments
 (0)