masq
/
glowing-bear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1029 from lorenzhs/update-electron 

Update electron and npm/bower packages
This commit is contained in:
Lorenz Hübschle-Schneider 2018-10-27 15:50:05 +02:00 committed by GitHub
parent a5ad0ca1d8 ddb665182e
commit 8ca571564e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bower.json
View File

@ -6,13 +6,13 @@
"license": "GPLv3", "license": "GPLv3",
"private": true, "private": true,
"dependencies": { "dependencies": {
"angular": "1.6.x", "angular": "1.7.x",
"angular-route": "1.6.x", "angular-route": "1.7.x",
"angular-sanitize": "1.6.x", "angular-sanitize": "1.7.x",
"angular-touch": "1.6.x", "angular-touch": "1.7.x",
"angular-loader": "1.6.x", "angular-loader": "1.7.x",
"angular-mocks": "1.6.x", "angular-mocks": "1.7.x",
"underscore": "~1.8" "underscore": "~1.9"
}, },
"devDependencies": { "devDependencies": {
"bootstrap": "~3.3", "bootstrap": "~3.3",

6
electron.makefile
View File

@ -18,10 +18,10 @@ uselocal: copylocal
# build the electron app for various platforms # build the electron app for various platforms
build-electron-windows: uselocal build-electron-windows: uselocal
electron-packager ${ELECTRON_COMMON} --platform=win32 --arch=ia32 --electron-version=1.8.4 --icon=assets/img/favicon.ico --asar=true electron-packager ${ELECTRON_COMMON} --platform=win32 --arch=ia32 --electron-version=3.0.6 --icon=assets/img/favicon.ico --asar=true
build-electron-darwin: uselocal build-electron-darwin: uselocal
electron-packager ${ELECTRON_COMMON} --platform=darwin --arch=x64 --electron-version=1.8.4 --icon=assets/img/glowing-bear.icns electron-packager ${ELECTRON_COMMON} --platform=darwin --arch=x64 --electron-version=3.0.6 --icon=assets/img/glowing-bear.icns
build-electron-linux: uselocal build-electron-linux: uselocal
electron-packager ${ELECTRON_COMMON} --platform=linux --arch=x64 --electron-version=1.8.4 --icon=assets/img/favicon.ico electron-packager ${ELECTRON_COMMON} --platform=linux --arch=x64 --electron-version=3.0.6 --icon=assets/img/favicon.ico

10
index.html
View File

@ -19,11 +19,11 @@
<link rel="shortcut icon" type="image/png" href="assets/img/favicon.png" > <link rel="shortcut icon" type="image/png" href="assets/img/favicon.png" >
<link href="css/glowingbear.css" rel="stylesheet" media="screen"> <link href="css/glowingbear.css" rel="stylesheet" media="screen">
<link href="css/themes/dark.css" rel="stylesheet" media="screen" id="themeCSS" /> <link href="css/themes/dark.css" rel="stylesheet" media="screen" id="themeCSS" />
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.6.8/angular.min.js" integrity="sha256-drxfSiYW94qA5Cyx5wrs8T8qV5GB45vES84r+X4zNS0=" crossorigin="anonymous"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.7.5/angular.min.js" integrity="sha256-QRJz3b0/ZZC4ilKmBRRjY0MgnVhQ+RR1tpWLYaRRjSo=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.6.8/angular-route.min.js" integrity="sha256-+rsaX/rEnnh0OQrK9qi+p7qsM8nylkcEfOOhgC3ver0=" crossorigin="anonymous"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.7.5/angular-route.min.js" integrity="sha256-PQfkC+TI/HZv0O9JbmrLmPyhgOT2hry24vA5yAV59zY=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.6.8/angular-sanitize.min.js" integrity="sha256-A5XIWW1Wvws/VV2ZVAhfMVtQKwILF+o/z3zYZ8fhiec=" crossorigin="anonymous"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.7.5/angular-sanitize.min.js" integrity="sha256-LLlLr1XzKUXSFI9SiuEJOAn88Dwge+/zld523N2c8+8=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.6.8/angular-touch.min.js" integrity="sha256-pe9bCE2Py8HOdaP2c5lLwLDIsWrpn9L9QpSzuMawOM8=" crossorigin="anonymous"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.7.5/angular-touch.min.js" integrity="sha256-4IS2pHNTST2Jl6dSzNsERpYleiQi1r4L2MLPElG8LZ4=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js" integrity="sha256-obZACiHd7gkOk9iIL/pimWMTJ4W/pBsKu+oZnSeBIek=" crossorigin="anonymous"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.9.1/underscore-min.js" integrity="sha256-G7A4JrJjJlFqP0yamznwPjAApIKPkadeHfyIwiaa9e0=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/emojione/2.2.7/lib/js/emojione.min.js" integrity="sha256-9cBkVeU53NiJ9/BdcJta3HbERAmf5X9DE2WvL8V+gDs=" crossorigin="anonymous"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/emojione/2.2.7/lib/js/emojione.min.js" integrity="sha256-9cBkVeU53NiJ9/BdcJta3HbERAmf5X9DE2WvL8V+gDs=" crossorigin="anonymous"></script>
<script type="text/javascript" src="3rdparty/inflate.min.js"></script> <script type="text/javascript" src="3rdparty/inflate.min.js"></script>
<script type="text/javascript" src="js/localstorage.js"></script> <script type="text/javascript" src="js/localstorage.js"></script>

10
package.json
View File

@ -8,17 +8,17 @@
"license": "GPLv3", "license": "GPLv3",
"devDependencies": { "devDependencies": {
"bower": "^1.8", "bower": "^1.8",
"electron-packager": "^11", "electron-packager": "^12.2.0",
"http-server": "^0.11", "http-server": "^0.11",
"jasmine-core": "^3.1", "jasmine-core": "^3.1",
"jshint": "^2.9", "jshint": "^2.9.6",
"karma": "~1.7", "karma": "^3.1.1",
"karma-jasmine": "~1.1", "karma-jasmine": "~1.1",
"karma-junit-reporter": "^1.2", "karma-junit-reporter": "^1.2",
"karma-phantomjs-launcher": "^1.0.0", "karma-phantomjs-launcher": "^1.0.0",
"protractor": "^5.0.0", "protractor": "^5.4.1",
"shelljs": "^0.8.0", "shelljs": "^0.8.0",
"uglify-js": "^3" "uglify-js": "^3.4.9"
}, },
"scripts": { "scripts": {
"postinstall": "bower install -p", "postinstall": "bower install -p",