Skip to content
This repository was archived by the owner on May 13, 2024. It is now read-only.

Commit 92ac267

Browse files
authored
Merge pull request #297 from Yelinz/version-0-12-0
Version bump to 0.12.0
2 parents 3cf8bd4 + 27eefcc commit 92ac267

File tree

2 files changed

+16
-20
lines changed

2 files changed

+16
-20
lines changed

package.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "timed",
3-
"version": "0.9.2",
3+
"version": "0.12.0",
44
"description": "A time tracking software written in Ember.js",
55
"directories": {
66
"test": "tests"
@@ -17,7 +17,8 @@
1717
"author": "Adfinis SyGroup AG <info@adfinis-sygroup.ch>",
1818
"license": "AGPL-3.0",
1919
"devDependencies": {
20-
"@html-next/vertical-collection": "github:html-next/vertical-collection#5c4fc6b18c75ec161eee39622dd0c068bff735f2",
20+
"@html-next/vertical-collection":
21+
"github:html-next/vertical-collection#5c4fc6b18c75ec161eee39622dd0c068bff735f2",
2122
"babel-eslint": "^8.0.1",
2223
"babel-plugin-transform-async-to-generator": "^6.24.1",
2324
"babel-plugin-transform-decorators-legacy": "^1.3.4",
@@ -32,7 +33,7 @@
3233
"ember-changeset": "^1.5.0",
3334
"ember-changeset-validations": "^1.3.1",
3435
"ember-cli": "~2.18.0",
35-
"ember-cli-app-version": "^3.0.0",
36+
"ember-cli-app-version": "^3.2.0",
3637
"ember-cli-babel": "^6.6.0",
3738
"ember-cli-chai": "^0.5.0",
3839
"ember-cli-chart": "^3.4.0",
@@ -96,9 +97,6 @@
9697
"prettier": "^1.7.4"
9798
},
9899
"greenkeeper": {
99-
"ignore": [
100-
"ember-cli-htmlbars-inline-precompile",
101-
"ember-cli-mirage"
102-
]
100+
"ignore": ["ember-cli-htmlbars-inline-precompile", "ember-cli-mirage"]
103101
}
104102
}

yarn.lock

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3006,12 +3006,13 @@ ember-changeset@1.5.0, ember-changeset@^1.5.0:
30063006
ember-cli-babel "^6.8.2"
30073007
ember-deep-set "^0.1.4"
30083008

3009-
ember-cli-app-version@^3.0.0:
3010-
version "3.1.0"
3011-
resolved "https://registry.yarnpkg.com/ember-cli-app-version/-/ember-cli-app-version-3.1.0.tgz#074b0330581a7b8ab094ff07fefb34e0d0254bfd"
3009+
ember-cli-app-version@^3.2.0:
3010+
version "3.2.0"
3011+
resolved "https://registry.yarnpkg.com/ember-cli-app-version/-/ember-cli-app-version-3.2.0.tgz#7b9ad0e1b63ae0518648356ee24c703e922bc26e"
3012+
integrity sha512-fHWOJElSw8JL03FNCHrT0RdWhGpWEQ4VQ10unEwwhVZ+OANNcOLz8O2dA3D5iuB4bb0fMLwjEwYZGM62+TBs1Q==
30123013
dependencies:
3013-
ember-cli-babel "^6.8.0"
3014-
git-repo-version "0.4.1"
3014+
ember-cli-babel "^6.12.0"
3015+
git-repo-version "^1.0.2"
30153016

30163017
ember-cli-babel@6.12.0, ember-cli-babel@^6.12.0:
30173018
version "6.12.0"
@@ -5151,15 +5152,12 @@ git-repo-info@^1.1.2, git-repo-info@^1.4.1:
51515152
version "1.4.1"
51525153
resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-1.4.1.tgz#2a072823254aaf62fcf0766007d7b6651bd41943"
51535154

5154-
git-repo-info@~1.2.0:
5155-
version "1.2.0"
5156-
resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-1.2.0.tgz#43d8513e04a24dd441330a2f7c6655a709fdbaf2"
5157-
5158-
git-repo-version@0.4.1:
5159-
version "0.4.1"
5160-
resolved "https://registry.yarnpkg.com/git-repo-version/-/git-repo-version-0.4.1.tgz#75fab9a0a4ec8470755b0eea7fdaa6f9d41453bf"
5155+
git-repo-version@^1.0.2:
5156+
version "1.0.2"
5157+
resolved "https://registry.yarnpkg.com/git-repo-version/-/git-repo-version-1.0.2.tgz#2c8e9bee5d970cafc0dd58480f9dc56d9afe8e4f"
5158+
integrity sha512-OPtwtHx9E8/rTMcWT+BU6GNj6Kq/O40bHJZaZAGy+pN2RXGmeKcfr0ix4M+SQuFY8vl5L/wfPSGOAtvUT/e3Qg==
51615159
dependencies:
5162-
git-repo-info "~1.2.0"
5160+
git-repo-info "^1.4.1"
51635161

51645162
git-tools@^0.1.4:
51655163
version "0.1.4"

0 commit comments

Comments
 (0)