diff options
author | Jannick Hemelhof | 2017-11-25 09:10:11 +0100 |
---|---|---|
committer | Jannick Hemelhof | 2017-11-25 09:10:11 +0100 |
commit | d7d5a6da7d6e13abd1aa56aec5690d475ec81152 (patch) | |
tree | ed14a2031e456477d339b8f5d6a89b2d6df19d6e | |
parent | ebb280d70de3e595c0e68c102f3a31fa88e2ab6d (diff) | |
download | aur-d7d5a6da7d6e13abd1aa56aec5690d475ec81152.tar.gz |
Update to v0.8.17
-rw-r--r-- | PKGBUILD | 8 | ||||
-rw-r--r-- | remove-analytics.patch | 89 | ||||
-rw-r--r-- | warning-fix.patch | 26 |
3 files changed, 74 insertions, 49 deletions
@@ -5,7 +5,7 @@ # Contributor: Romain Bazile <gromain {dot} baz {at} gmail {dot} com> pkgname=boostnote _pkgname=Boostnote -pkgver=0.8.16 +pkgver=0.8.17 pkgrel=1 pkgdesc="Open source note-taking app for programmers" arch=('any') @@ -23,11 +23,11 @@ source=( ) sha512sums=( - '8a8da51acd39d169e25023f095e77082eb1f99ffa38b7fb30a2b666255da43d61e0e97bec9575e2bc7918f82bc9c827b2a6859d938b16cce3f106ac70c5a813f' + '5c28859a459cf54355f88d6abebb9b5a0c1b4f229491d54296a632ea27c43a06227c0699b2858cd4526e835679dadf9981b9c8102aac3894ccc3e8bba1da07e1' 'f0abbdcca34d7f74d3dc66ffc2d0995416e7708c715d55fa58c4c2abc31d191ea42f3434e3105292b4817f83ac0ca89f456f5f93007ae80ab2426c8941f615f9' '18bcda13580da8ceeaa86793a77ec00a053b8fd51451dad7e2b1a19553fe1a467ac647b44b789212e783f3f6a80968cc9404e884ef7ff6b1f6588473b3229d40' - '4bc6ed51f34496fe3354e55f5bee7c00997b48c5fa45f0565390a73fab0ecc4ab80285a6835ca6e5d5cb94de61063dbc6e49f0e0ac40983e96a99155fe4e6ab9' - '179652326e95599cf96c0a7a513b58a94c04c006c339146135e66b231d4a48094792116a6520bbfdc5543b0a39bbad2a624000e3087e04de88909881595c813d' + '87d883064a58b8bf0e92f42ad40c7da1f3eae4ab4eb1029b3f22f34c47233f6543430b3fe41cb385511d6e6aabcc8eef4c08d0963a7950e331f319f9ebcf0524' + 'ba5aa092e3bf29d3ad08be198691ddb24e10f5dff3c1700d5c85da5c54a611e3a94164eb23b149e7e31be7f88afad5ec8b93712922cdd0039f323b8cbe2808d9' ) prepare() { diff --git a/remove-analytics.patch b/remove-analytics.patch index 18effed9f5b2..599140de87ba 100644 --- a/remove-analytics.patch +++ b/remove-analytics.patch @@ -1,6 +1,6 @@ diff -ura a/browser/finder/index.js b/browser/finder/index.js ---- a/browser/finder/index.js 2017-10-28 07:15:41.000000000 +0200 -+++ b/browser/finder/index.js 2017-10-28 16:43:06.758192934 +0200 +--- a/browser/finder/index.js 2017-11-25 06:41:20.000000000 +0100 ++++ b/browser/finder/index.js 2017-11-25 08:47:43.067324811 +0100 @@ -10,7 +10,6 @@ import NoteList from './NoteList' import NoteDetail from './NoteDetail' @@ -18,17 +18,17 @@ diff -ura a/browser/finder/index.js b/browser/finder/index.js e.preventDefault() } diff -ura a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js ---- a/browser/main/Detail/MarkdownNoteDetail.js 2017-10-28 07:15:41.000000000 +0200 -+++ b/browser/main/Detail/MarkdownNoteDetail.js 2017-10-28 16:43:05.358168557 +0200 +--- a/browser/main/Detail/MarkdownNoteDetail.js 2017-11-25 06:41:20.000000000 +0100 ++++ b/browser/main/Detail/MarkdownNoteDetail.js 2017-11-25 08:48:07.247452962 +0100 @@ -13,7 +13,6 @@ import StatusBar from '../StatusBar' import _ from 'lodash' import { findNoteTitle } from 'browser/lib/findNoteTitle' -import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig' import TrashButton from './TrashButton' + import PermanentDeleteButton from './PermanentDeleteButton' import InfoButton from './InfoButton' - import InfoPanel from './InfoPanel' -@@ -106,7 +105,6 @@ +@@ -107,7 +106,6 @@ type: 'UPDATE_NOTE', note: note }) @@ -36,7 +36,7 @@ diff -ura a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/Mark }) } -@@ -145,7 +143,6 @@ +@@ -146,7 +144,6 @@ handleStarButtonClick (e) { let { note } = this.state @@ -45,17 +45,17 @@ diff -ura a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/Mark note.isStarred = !note.isStarred diff -ura a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js ---- a/browser/main/Detail/SnippetNoteDetail.js 2017-10-28 07:15:41.000000000 +0200 -+++ b/browser/main/Detail/SnippetNoteDetail.js 2017-10-28 16:43:04.108146800 +0200 +--- a/browser/main/Detail/SnippetNoteDetail.js 2017-11-25 06:41:20.000000000 +0100 ++++ b/browser/main/Detail/SnippetNoteDetail.js 2017-11-25 08:49:05.157759882 +0100 @@ -16,7 +16,6 @@ import ConfigManager from 'browser/main/lib/ConfigManager' import _ from 'lodash' import { findNoteTitle } from 'browser/lib/findNoteTitle' -import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig' import TrashButton from './TrashButton' + import PermanentDeleteButton from './PermanentDeleteButton' import InfoButton from './InfoButton' - import InfoPanel from './InfoPanel' -@@ -116,7 +115,6 @@ +@@ -117,7 +116,6 @@ type: 'UPDATE_NOTE', note: note }) @@ -63,7 +63,7 @@ diff -ura a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/Snipp }) } -@@ -155,7 +153,6 @@ +@@ -156,7 +154,6 @@ handleStarButtonClick (e) { let { note } = this.state @@ -71,7 +71,7 @@ diff -ura a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/Snipp note.isStarred = !note.isStarred -@@ -272,9 +269,6 @@ +@@ -273,9 +270,6 @@ const mode = syntax != null ? syntax.name : null if (mode != null) { snippets[index].mode = mode @@ -81,7 +81,7 @@ diff -ura a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/Snipp } this.setState({note: Object.assign(this.state.note, {snippets: snippets})}) -@@ -296,10 +290,6 @@ +@@ -297,10 +291,6 @@ }, () => { this.save() }) @@ -93,8 +93,8 @@ diff -ura a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/Snipp } diff -ura a/browser/main/Detail/TagSelect.js b/browser/main/Detail/TagSelect.js ---- a/browser/main/Detail/TagSelect.js 2017-10-28 07:15:41.000000000 +0200 -+++ b/browser/main/Detail/TagSelect.js 2017-10-28 16:43:02.798124006 +0200 +--- a/browser/main/Detail/TagSelect.js 2017-11-25 06:41:20.000000000 +0100 ++++ b/browser/main/Detail/TagSelect.js 2017-11-25 08:49:20.347840387 +0100 @@ -2,7 +2,6 @@ import CSSModules from 'browser/lib/CSSModules' import styles from './TagSelect.styl' @@ -112,17 +112,17 @@ diff -ura a/browser/main/Detail/TagSelect.js b/browser/main/Detail/TagSelect.js let newTag = this.refs.newTag.value.trim().replace(/ +/g, '_') diff -ura a/browser/main/Main.js b/browser/main/Main.js ---- a/browser/main/Main.js 2017-10-28 07:15:41.000000000 +0200 -+++ b/browser/main/Main.js 2017-10-28 16:43:01.708105043 +0200 -@@ -12,7 +12,6 @@ +--- a/browser/main/Main.js 2017-11-25 06:41:20.000000000 +0100 ++++ b/browser/main/Main.js 2017-11-25 08:49:38.187934938 +0100 +@@ -11,7 +11,6 @@ + import ConfigManager from 'browser/main/lib/ConfigManager' import modal from 'browser/main/lib/modal' import InitModal from 'browser/main/modals/InitModal' - import mixpanel from 'browser/main/lib/mixpanel' -import mobileAnalytics from 'browser/main/lib/AwsMobileAnalyticsConfig' import eventEmitter from 'browser/main/lib/eventEmitter' - import RealtimeNotification from 'browser/components/RealtimeNotification' -@@ -25,10 +24,6 @@ + class Main extends React.Component { +@@ -19,10 +18,6 @@ constructor (props) { super(props) @@ -134,8 +134,8 @@ diff -ura a/browser/main/Main.js b/browser/main/Main.js this.state = { diff -ura a/browser/main/modals/CreateFolderModal.js b/browser/main/modals/CreateFolderModal.js ---- a/browser/main/modals/CreateFolderModal.js 2017-10-28 07:15:41.000000000 +0200 -+++ b/browser/main/modals/CreateFolderModal.js 2017-10-28 16:43:00.398082262 +0200 +--- a/browser/main/modals/CreateFolderModal.js 2017-11-25 06:41:20.000000000 +0100 ++++ b/browser/main/modals/CreateFolderModal.js 2017-11-25 08:49:54.078019153 +0100 @@ -5,7 +5,6 @@ import store from 'browser/main/store' import consts from 'browser/lib/consts' @@ -153,8 +153,8 @@ diff -ura a/browser/main/modals/CreateFolderModal.js b/browser/main/modals/Creat let { storage } = this.props let input = { diff -ura a/browser/main/modals/NewNoteModal.js b/browser/main/modals/NewNoteModal.js ---- a/browser/main/modals/NewNoteModal.js 2017-10-28 07:15:41.000000000 +0200 -+++ b/browser/main/modals/NewNoteModal.js 2017-10-28 16:42:58.998057921 +0200 +--- a/browser/main/modals/NewNoteModal.js 2017-11-25 06:41:20.000000000 +0100 ++++ b/browser/main/modals/NewNoteModal.js 2017-11-25 08:50:13.178120381 +0100 @@ -5,7 +5,6 @@ import { hashHistory } from 'react-router' import ee from 'browser/main/lib/eventEmitter' @@ -182,17 +182,17 @@ diff -ura a/browser/main/modals/NewNoteModal.js b/browser/main/modals/NewNoteMod dataApi diff -ura a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modals/PreferencesModal/InfoTab.js ---- a/browser/main/modals/PreferencesModal/InfoTab.js 2017-10-28 07:15:41.000000000 +0200 -+++ b/browser/main/modals/PreferencesModal/InfoTab.js 2017-10-28 16:43:17.828385961 +0200 +--- a/browser/main/modals/PreferencesModal/InfoTab.js 2017-11-25 06:41:20.000000000 +0100 ++++ b/browser/main/modals/PreferencesModal/InfoTab.js 2017-11-25 08:52:13.558758387 +0100 @@ -3,7 +3,6 @@ import styles from './InfoTab.styl' import ConfigManager from 'browser/main/lib/ConfigManager' import store from 'browser/main/store' -import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig' + import _ from 'lodash' const electron = require('electron') - const { shell, remote } = electron -@@ -23,29 +22,6 @@ +@@ -24,47 +23,6 @@ e.preventDefault() } @@ -209,8 +209,21 @@ diff -ura a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modal - - if (!newConfig.amaEnabled) { - AwsMobileAnalyticsConfig.recordDynamicCustomEvent('DISABLE_AMA') +- this.setState({ +- amaMessage: 'We hope we will gain your trust' +- }) +- } else { +- this.setState({ +- amaMessage: 'Thank\'s for trust us' +- }) - } - +- _.debounce(() => { +- this.setState({ +- amaMessage: '' +- }) +- }, 3000)() +- - ConfigManager.set(newConfig) - - store.dispatch({ @@ -219,14 +232,21 @@ diff -ura a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modal - }) - } - +- infoMessage () { +- const { amaMessage } = this.state +- return amaMessage ? <p styleName='policy-confirm'>{amaMessage}</p> : null +- } +- render () { return ( <div styleName='root'> -@@ -95,18 +71,6 @@ +@@ -134,21 +92,6 @@ License: GPL v3 </li> </ul> -- <hr /> +- +- <hr styleName='separate-line' /> +- - <div styleName='policy'>Data collection policy</div> - <div>We collect only the number of DAU for Boostnote and **DO NOT collect** any detail information such as your note content.</div> - <div>You can see how it works on <a href='https://github.com/BoostIO/Boostnote' onClick={(e) => this.handleLinkClick(e)}>GitHub</a>.</div> @@ -238,12 +258,13 @@ diff -ura a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modal - /> - Enable to send analytics to our servers<br /> - <button styleName='policy-submit' onClick={(e) => this.handleSaveButtonClick(e)}>Save</button> +- {this.infoMessage()} </div> ) } diff -ura a/package.json b/package.json ---- a/package.json 2017-10-28 07:15:41.000000000 +0200 -+++ b/package.json 2017-10-28 16:55:58.360290459 +0200 +--- a/package.json 2017-11-25 06:41:20.000000000 +0100 ++++ b/package.json 2017-11-25 08:52:24.738817641 +0100 @@ -50,8 +50,6 @@ "dependencies": { "@rokt33r/markdown-it-math": "^4.0.1", diff --git a/warning-fix.patch b/warning-fix.patch index 9033ecf260cb..877e35e16148 100644 --- a/warning-fix.patch +++ b/warning-fix.patch @@ -1,6 +1,6 @@ -diff -ura a/gruntfile.js b/gruntfile.js ---- a/gruntfile.js 2017-09-23 10:02:56.000000000 +0200 -+++ b/gruntfile.js 2017-09-24 11:45:31.328097911 +0200 +diff -ura b/gruntfile.js a/gruntfile.js +--- b/gruntfile.js 2017-11-25 06:41:20.000000000 +0100 ++++ a/gruntfile.js 2017-11-25 08:41:59.315502962 +0100 @@ -6,6 +6,7 @@ module.exports = function (grunt) { @@ -17,28 +17,30 @@ diff -ura a/gruntfile.js b/gruntfile.js const OSX_COMMON_NAME = authCode != null ? authCode.OSX_COMMON_NAME : '' const WIN_CERT_PASSWORD = authCode != null ? authCode.WIN_CERT_PASSWORD : '' -@@ -55,9 +57,11 @@ +@@ -74,10 +76,12 @@ grunt.initConfig(initConfig) grunt.loadNpmTasks('grunt-electron-installer') + /* if (!WIN) { grunt.loadNpmTasks('grunt-electron-installer-debian') + grunt.loadNpmTasks('grunt-electron-installer-redhat') } + */ grunt.registerTask('compile', function () { var done = this.async() -diff -ura a/package.json b/package.json ---- a/package.json 2017-09-23 10:02:56.000000000 +0200 -+++ b/package.json 2017-09-24 11:47:08.785280478 +0200 -@@ -98,15 +98,14 @@ +Alleen in a: node_modules +diff -ura b/package.json a/package.json +--- b/package.json 2017-11-25 06:41:20.000000000 +0100 ++++ a/package.json 2017-11-25 08:59:51.466808693 +0100 +@@ -102,15 +102,15 @@ "css-loader": "^0.19.0", "devtron": "^1.1.0", "dom-storage": "^2.0.2", - "electron-packager": "^6.0.0", -- "electron-prebuilt": "^1.2.8", + "electron-packager": "^8.6.0", + "electron": "^1.6.15", "eslint": "^3.13.1", "eslint-config-standard": "^6.2.1", "eslint-config-standard-jsx": "^3.2.0", @@ -51,7 +53,7 @@ diff -ura a/package.json b/package.json "history": "^1.17.0", "jsdom": "^9.4.2", "json-loader": "^0.5.4", -@@ -119,14 +118,11 @@ +@@ -123,15 +123,11 @@ "react-router-redux": "^4.0.4", "standard": "^8.4.0", "style-loader": "^0.12.4", @@ -62,8 +64,10 @@ diff -ura a/package.json b/package.json "webpack-dev-server": "^1.12.0" }, - "optionalDependencies": { -- "grunt-electron-installer-debian": "^0.2.0" +- "grunt-electron-installer-debian": "^0.2.0", +- "grunt-electron-installer-redhat": "^0.3.1" - }, "optional": false, "ava": { "files": [ +Alleen in a: package-lock.json |