Merge pull request #83 from Pear-Trading/master

Master
This commit is contained in:
Finn 2018-06-06 14:35:12 +01:00 committed by GitHub
commit f018e72e3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 15 deletions

View file

@ -2,6 +2,17 @@
# Next Release
# 0.1.12
* Fixed accidentally added app-root
# 0.1.11
* Bumped Angular to version 6 and upgraded packages to match
* Converted RxJS 5 syntax to RxJS 6
* Removed extraneous console logs
* Changed dashboard sector list to category all time list & tweaked layout
# 0.1.10
* Allowed for creation of yearly recurring transactions

View file

@ -3,7 +3,7 @@
"version": 1,
"newProjectRoot": "projects",
"projects": {
"coreui-angular": {
"localloop-web": {
"root": "",
"sourceRoot": "src",
"projectType": "application",
@ -91,27 +91,27 @@
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "coreui-angular:build"
"browserTarget": "localloop-web:build"
},
"configurations": {
"dev": {
"browserTarget": "coreui-angular:build:dev"
"browserTarget": "localloop-web:build:dev"
},
"production": {
"browserTarget": "coreui-angular:build:production"
"browserTarget": "localloop-web:build:production"
},
"local": {
"browserTarget": "coreui-angular:build:local"
"browserTarget": "localloop-web:build:local"
},
"ci": {
"browserTarget": "coreui-angular:build:ci"
"browserTarget": "localloop-web:build:ci"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "coreui-angular:build"
"browserTarget": "localloop-web:build"
}
},
"test": {
@ -144,7 +144,7 @@
}
}
},
"coreui-angular-e2e": {
"localloop-web-e2e": {
"root": "",
"sourceRoot": "",
"projectType": "application",
@ -153,14 +153,14 @@
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "coreui-angular:serve"
"devServerTarget": "localloop-web:serve"
},
"configurations": {
"local": {
"devServerTarget": "coreui-angular:serve:local"
"devServerTarget": "localloop-web:serve:local"
},
"ci": {
"devServerTarget": "coreui-angular:serve:ci"
"devServerTarget": "localloop-web:serve:ci"
}
}
},
@ -176,7 +176,7 @@
}
}
},
"defaultProject": "coreui-angular",
"defaultProject": "localloop-web",
"schematics": {
"@schematics/angular:component": {
"prefix": "app",

2
package-lock.json generated
View file

@ -1,6 +1,6 @@
{
"name": "localloop-web",
"version": "0.1.9",
"version": "0.1.11",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View file

@ -1,6 +1,6 @@
{
"name": "localloop-web",
"version": "0.1.9",
"version": "0.1.11",
"description": "LocalLoop Web - Web interface for LocalLoop app",
"author": "",
"url": "http://www.peartrade.org",

View file

@ -122,7 +122,6 @@
<div class="sk-cube3 sk-cube"></div>
</div>
</app-root>
<app-root></app-root>
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),