diff --git a/.eslintrc.js b/.eslintrc.js
index 3bfe878..4f33edb 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -11,6 +11,7 @@ module.exports = {
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'no-plusplus': 'off',
+ 'import/no-cycle': 'off',
},
parserOptions: {
parser: 'babel-eslint',
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe1f3d2..923d3a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [1.2.4] - 2020-07-04
+- Move external fonts (icons + google font) to internal dependencies to allow for offline use (https://github.com/BC-SECURITY/Starkiller/issues/34)
+- Change title of login url field
+- Make the use of http/https prefixes in the empire url optional. Will default to https if no prefix provided
+
## [1.2.3] - 2020-05-24
- Fix a bug that didn't allow 0 values when creating listeners, stagers
- Updated agent tab ui to have centered tabs
@@ -45,4 +50,4 @@ Including but not limited to:
- Axios dependency upgraded
## [1.0.0] - 2020-03-08
-- Initial Release
\ No newline at end of file
+- Initial Release
diff --git a/package.json b/package.json
index a3df5d5..d581a0d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "starkiller",
- "version": "1.2.3",
+ "version": "1.2.4",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
@@ -19,6 +19,8 @@
},
"main": "background.js",
"dependencies": {
+ "@fortawesome/fontawesome-free": "^5.13.1",
+ "@mdi/font": "^5.3.45",
"axios": "0.18.1",
"chai-as-promised": "^7.1.1",
"core-js": "^3.4.4",
@@ -26,10 +28,11 @@
"lodash.debounce": "^4.0.8",
"moment": "^2.24.0",
"semver": "^7.1.3",
+ "typeface-roboto": "^0.0.75",
"vue": "^2.6.10",
"vue-router": "^3.1.3",
"vue-splitpane": "^1.0.6",
- "vuetify": "^2.2.22",
+ "vuetify": "2.2.34",
"vuetify-toast-snackbar": "^0.6.1",
"vuex": "^3.1.2",
"vuex-persistedstate": "^3.0.1"
diff --git a/public/index.html b/public/index.html
index 29f604e..24b8126 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,9 +5,6 @@
-
-
-
starkiller
diff --git a/src/App.vue b/src/App.vue
index b69630d..638f737 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -47,11 +47,11 @@ export default {
},
computed: {
...mapGetters({
- isLoggedIn: 'profile/isLoggedIn',
- isDarkMode: 'profile/isDarkMode',
+ isLoggedIn: 'application/isLoggedIn',
+ isDarkMode: 'application/isDarkMode',
}),
...mapState({
- empireVersion: state => state.profile.empireVersion,
+ empireVersion: state => state.application.empireVersion,
}),
isLoginPage() {
return this.$route.name === 'home';
@@ -106,6 +106,9 @@ export default {