Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: code-to-json/code-to-json.github.io
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.0
Choose a base ref
...
head repository: code-to-json/code-to-json.github.io
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.0.1
Choose a head ref
  • 4 commits
  • 5 files changed
  • 2 contributors

Commits on Dec 20, 2018

  1. fix: semantic release exec plugin config

    @mike-north
    mike-north committed Dec 20, 2018

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    fe288c5 View commit details

  2. Merge branch 'master' of github.com:code-to-json/code-to-json.github.io

    @mike-north
    mike-north committed Dec 20, 2018

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    f30833b View commit details

  3. ci: fix travis CI deploy condition

    @mike-north
    mike-north committed Dec 20, 2018

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    45c7c83 View commit details

  4. chore(release): 1.0.1 [skip ci] 

    ## [1.0.1](v1.0.0...v1.0.1) (2018-12-20)

### Bug Fixes

* semantic release exec plugin config ([fe288c5](fe288c5))
    @semantic-release-bot
    semantic-release-bot committed Dec 20, 2018
    Copy the full SHA
    addd68f View commit details
Showing with 27 additions and 4 deletions.
  1. +1 −1 .travis.yml
  2. +7 −0 CHANGELOG.md
  3. +16 −0 assets/c2jweb-2f21b861a7cd4e571a85053dd49cbd33.js
  4. +2 −2 index.html
  5. +1 −1 package.json
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ env:
stages:
- build
- name: deploy
- if: branch = master AND type = push
if: branch = master AND type = push

jobs:
fail_fast: true
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [1.0.1](https://github.com/code-to-json/code-to-json.github.io/compare/v1.0.0...v1.0.1) (2018-12-20)


### Bug Fixes

* semantic release exec plugin config ([fe288c5](https://github.com/code-to-json/code-to-json.github.io/commit/fe288c5))

# 1.0.0 (2018-12-20)


16 changes: 16 additions & 0 deletions assets/c2jweb-2f21b861a7cd4e571a85053dd49cbd33.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions index.html
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">


<meta name="c2jweb/config/environment" content="%7B%22modulePrefix%22%3A%22c2jweb%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22/%22%2C%22locationType%22%3A%22auto%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%7D%7D%2C%22APP%22%3A%7B%22name%22%3A%22c2jweb%22%2C%22version%22%3A%220.0.0+02413768%22%7D%2C%22exportApplicationGlobal%22%3Afalse%7D" />
<meta name="c2jweb/config/environment" content="%7B%22modulePrefix%22%3A%22c2jweb%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22/%22%2C%22locationType%22%3A%22auto%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%7D%7D%2C%22APP%22%3A%7B%22name%22%3A%22c2jweb%22%2C%22version%22%3A%220.0.0+45c7c832%22%7D%2C%22exportApplicationGlobal%22%3Afalse%7D" />

<link integrity="" rel="stylesheet" href="/assets/vendor-d41d8cd98f00b204e9800998ecf8427e.css">
<link integrity="" rel="stylesheet" href="/assets/c2jweb-d41d8cd98f00b204e9800998ecf8427e.css">
@@ -19,7 +19,7 @@


<script src="/assets/vendor-b0712c5d429ddf3eab5ab61f3b314227.js" integrity="sha256-cGrutR3JEwE0d+whQfgi5P7lrzWadb55X73Mmf/I740= sha512-jtzj31qoCicUd+p/N8DBHY4vuMkzTlBA/Lf1DlsfPFZXdg6137JohfNBKAoza9yT6w6ZVRIk6hS7/UPvBPxc9w==" ></script>
<script src="/assets/c2jweb-f7f7f4d88834dac57baf674c5fddb77a.js" integrity="sha256-ggKwf7IB/lbP4lFwzl3F5UduOcAY/esw8BnH+Y54Hl8= sha512-ovmlC8uy+igXl/2d4r3y4Uzrm6Vaj4XCfuySGydq3MZbUszKCDyOGKTWECKhW9BIvj2s1fUsglsukP0e1L20LQ==" ></script>
<script src="/assets/c2jweb-2f21b861a7cd4e571a85053dd49cbd33.js" integrity="sha256-sFCXJrKmHa96eQ+nFj5vwSrwK//89hlhrP0KT5zS+TE= sha512-fuPQKivO//JGazqlugBobiefLkvstyJRMEGP/T/s/AVJDu/AFJgfR54vx7ZoW3jHnJmN26LRh8A4fvm1OYPfHw==" ></script>


</body>
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -79,7 +79,7 @@
[
"@semantic-release/exec",
{
"publishCmd": ".travis/build.sh ${nextRelease.version} ${options.branch} ${commits.length} ${Date.now()}"
"prepareCmd": ".travis/build.sh ${nextRelease.version} ${options.branch} ${commits.length} ${Date.now()}"
}
],
{