diff --git a/CHANGELOG.md b/CHANGELOG.md index 478860ee9..1bbda7123 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). Use the following format for additions: ` - VERSION: [feature/patch (if applicable)] Short description of change. Links to relevant issues/PRs.` +- 1.4.41: Remove Google Analytics [#1182](https://github.com/FredrikNoren/ungit/pull/1182) - 1.4.40: Remove Keen.io [#1180](https://github.com/FredrikNoren/ungit/pull/1180) - 1.4.39: Add git bin path config. [#1151](https://github.com/FredrikNoren/ungit/issues/1151) - 1.4.38: Fix: Highlight current branch in submodules diff --git a/components/app/app.html b/components/app/app.html index 31f5e7681..cd38e4890 100644 --- a/components/app/app.html +++ b/components/app/app.html @@ -22,7 +22,6 @@

Help make ungit better with the press of a button!

- diff --git a/components/app/app.js b/components/app/app.js index acfdb1b04..8dcca118f 100644 --- a/components/app/app.js +++ b/components/app/app.js @@ -108,18 +108,14 @@ class AppViewModel { return dialog; })); } - gitSetUserConfig(bugTracking, sendUsageStatistics) { + gitSetUserConfig(bugTracking) { this.server.getPromise('/userconfig') .then((userConfig) => { userConfig.bugtracking = bugTracking; - if (sendUsageStatistics != undefined) userConfig.sendUsageStatistics = sendUsageStatistics; return this.server.postPromise('/userconfig', userConfig) .then(() => { this.bugtrackingEnabled(bugTracking); }); }); } - enableBugtrackingAndStatistics() { - this.gitSetUserConfig(true, true); - } enableBugtracking() { this.gitSetUserConfig(true); } diff --git a/components/gitErrors/gitErrors.html b/components/gitErrors/gitErrors.html index 1148dc013..e77656b8e 100644 --- a/components/gitErrors/gitErrors.html +++ b/components/gitErrors/gitErrors.html @@ -7,9 +7,6 @@

Unhandled git error!< Ungit tried to run a git command that resulted in an unhandled error. An automatic bug report was sent.

-

- to automatically report bugs, and/or file an issue on the ungit issue tracker. -

Command


   

Error

diff --git a/components/gitErrors/gitErrors.js b/components/gitErrors/gitErrors.js index 22ea7baa5..958167a0c 100644 --- a/components/gitErrors/gitErrors.js +++ b/components/gitErrors/gitErrors.js @@ -50,13 +50,4 @@ class GitErrorViewModel { dismiss() { this.gitErrors.gitErrors.remove(this); } - - enableBugtrackingAndStatistics() { - this.server.getPromise('/userconfig') - .then(userConfig => { - userConfig.bugtracking = true; - userConfig.sendUsageStatistics = true; - return this.server.postPromise('/userconfig', userConfig) - }).then(() => { this.showEnableBugtracking(false); }) - } } diff --git a/nmclicktests/environment.js b/nmclicktests/environment.js index 03b52357d..f3198710d 100644 --- a/nmclicktests/environment.js +++ b/nmclicktests/environment.js @@ -291,7 +291,6 @@ class Environment { '--no-launchBrowser', '--dev', '--no-bugtracking', - '--no-sendUsageStatistics', `--autoShutdownTimeout=${this.config.serverTimeout}`, '--logLevel=debug', '--maxNAutoRestartOnCrash=0', diff --git a/package-lock.json b/package-lock.json index f6dd578a5..d3e318f1a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ungit", - "version": "1.4.40", + "version": "1.4.41", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 6d6d99fc4..af0710b64 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "ungit", "author": "Fredrik Norén ", "description": "Git made easy", - "version": "1.4.40", + "version": "1.4.41", "ungitPluginApiVersion": "0.2.0", "scripts": { "start": "node ./bin/ungit", diff --git a/public/index.html b/public/index.html index a52abf1ad..5b9d37390 100644 --- a/public/index.html +++ b/public/index.html @@ -48,17 +48,6 @@ diff --git a/source/config.js b/source/config.js index 917e99534..8e46fe08c 100644 --- a/source/config.js +++ b/source/config.js @@ -35,9 +35,6 @@ const defaultConfig = { // This will automatically send anonymous bug reports. bugtracking: false, - // Google analytics for usage statistics. - sendUsageStatistics: false, - // True to enable authentication. Users are defined in the users configuration property. authentication: false, @@ -189,7 +186,6 @@ let argv = yargs .describe('logGitCommands', 'Write git commands issued to the log') .describe('logGitOutput', 'Write the result of git commands issued to the log') .describe('bugtracking', 'This will automatically send anonymous bug reports') -.describe('sendUsageStatistics', 'Google analytics for usage statistics') .describe('authentication', 'True to enable authentication. Users are defined in the users configuration property') .describe('users', 'Map of username/passwords which are granted access') .describe('showRebaseAndMergeOnlyOnRefs', 'Set to false to show rebase and merge on drag and drop on all nodes')