Skip to content

Commit

Permalink
Merge commit 'ea7ab044557e2b7977092dbe7e15b9f432330d30'
Browse files Browse the repository at this point in the history
* commit 'ea7ab044557e2b7977092dbe7e15b9f432330d30':
  ⚡️ Release 1.3.3 (parse-community#1100)
  1.3.2 version bump + changelog (parse-community#1099)
  Update Dockerfile (parse-community#1098)
  Update file-loader to the latest version 🚀 (parse-community#1095)
  Update react-router-dom to the latest version 🚀 (parse-community#1094)
  Update react-router to the latest version 🚀 (parse-community#1093)
  Update webpack to the latest version 🚀 (parse-community#1092)
  Update express to the latest version 🚀 (parse-community#1090)
  Update puppeteer to the latest version 🚀 (parse-community#1089)
  Update webpack to the latest version 🚀 (parse-community#1088)
  Update Dockerfile (parse-community#1087)
  Update webpack to the latest version 🚀 (parse-community#1084)
  • Loading branch information
cycqitianwushuge committed Jun 10, 2019
2 parents 02dfc2d + ea7ab04 commit 9be7c14
Show file tree
Hide file tree
Showing 6 changed files with 245 additions and 376 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ after_script:
- greenkeeper-lockfile-upload
deploy:
provider: npm
skip_cleanup: true
on:
tags: true
all_branches: true
Expand Down
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
## Parse Dashboard Changelog

### master
[Full Changelog](https://github.com/parse-community/parse-dashboard/compare/1.3.1...master)
[Full Changelog](https://github.com/parse-community/parse-dashboard/compare/1.3.3...master)

* _Contributing to this repo? Add info about your change here to be included in next release_

### 1.3.3
[Full Changelog](https://github.com/parse-community/parse-dashboard/compare/1.3.2...1.3.3)

* FIX: Travis configuration which was preventing 1.3.2 from publishing, thanks to [Diamond Lewis](https://github.com/dplewis)

### 1.3.2
[Full Changelog](https://github.com/parse-community/parse-dashboard/compare/1.3.1...1.3.2)

* FIX: Dockerhub configuration which was preventing 1.3.1 from publishing ([#1098](https://github.com/parse-community/parse-dashboard/pull/1098)), thanks to [Diamond Lewis](https://github.com/dplewis)

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

Expand Down
5 changes: 4 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
# --- Base Node Image ---
FROM node:8-alpine AS base

RUN apk update; \
apk add git;

WORKDIR /src

# Copy package.json first to benefit from layer caching
Expand All @@ -15,7 +18,7 @@ RUN npm install
COPY . /src

# Run all webpack build steps
RUN npm run prepublish && npm run build
RUN npm run prepare && npm run build


#
Expand Down
Binary file removed Parse-Dashboard/public/favicon.ico
Binary file not shown.
Loading

0 comments on commit 9be7c14

Please sign in to comment.