Skip to content

Commit

Permalink
v2.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
marcelklehr committed Dec 10, 2019
1 parent 198ab08 commit 3c75099
Show file tree
Hide file tree
Showing 28 changed files with 168 additions and 160 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## v2.3.2

- FIX webpack build
- FIX: Create bookmarks in the current folder
- FIX: Make folder icons clickable
- FIX translations
- NEW: translations

## v2.3.1

- FIX: Load tags on app init
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ source_dir=$(build_dir)/source
sign_dir=$(build_dir)/sign
package_name=$(app_name)
cert_dir=$(HOME)/.nextcloud/certificates
version+=2.3.1
version+=2.3.2

all: dev-setup lint build-js-production test test-php
all: dev-setup build-js-production test test-php

release: appstore create-tag

Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This app provides you with a web interface for collecting and organizing bookmar
Check out the third-party clients listed here: https://github.com/nextcloud/bookmarks#third-party-clients
]]></description>
<version>2.3.1</version>
<version>2.3.2</version>
<licence>agpl</licence>
<author mail="blizzz@arthur-schiwon.de" homepage="https://www.arthur-schiwon.de">Arthur Schiwon</author>
<author mail="mklehr@gmx.net">Marcel Klehr</author>
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bookmarks",
"version": "2.3.1",
"version": "2.3.2",
"main": "js/index.js",
"scripts": {
"dev": "webpack --config webpack.dev.js",
Expand Down
6 changes: 3 additions & 3 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ export default {
computed: {
error() {
return this.$store.state.error
}
},
},
watch: {
error(error) {
if (!error) return
OC.Notification.showTemporary(error)
this.$store.commit(mutations.SET_ERROR, null)
}
}
},
},
}
</script>
2 changes: 1 addition & 1 deletion src/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Vue.directive('tooltip', Tooltip)
const BookmarksApp = (global['Bookmarks'] = new Vue({
el: '#bookmarks',
store,
render: h => h(App)
render: h => h(App),
}))

export default BookmarksApp
16 changes: 8 additions & 8 deletions src/components/Bookmark.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ export default {
components: {
Actions,
ActionButton,
TagLine
TagLine,
},
props: {
bookmark: {
type: Object,
required: true
}
required: true,
},
},
data() {
return { title: this.bookmark.title, renaming: false, selected: false }
Expand All @@ -112,7 +112,7 @@ export default {
},
viewMode() {
return this.$store.state.viewMode
}
},
},
watch: {
selected(val, oldVal) {
Expand All @@ -121,14 +121,14 @@ export default {
} else {
this.$store.commit(mutations.REMOVE_SELECTION_BOOKMARK, this.bookmark)
}
}
},
},
created() {},
methods: {
onDelete() {
this.$store.dispatch(actions.DELETE_BOOKMARK, {
id: this.bookmark.id,
folder: this.$store.state.fetchState.query.folder
folder: this.$store.state.fetchState.query.folder,
})
},
onDetails() {
Expand All @@ -151,8 +151,8 @@ export default {
},
clickSelect() {
this.selected = !this.selected
}
}
},
},
}
</script>
<style>
Expand Down
12 changes: 6 additions & 6 deletions src/components/BookmarksList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@ export default {
Bookmark,
Folder,
CreateBookmark,
CreateFolder
CreateFolder,
},
props: {
bookmarks: {
type: Array,
required: true
required: true,
},
loading: {
type: Boolean,
required: true
}
required: true,
},
},
computed: {
folderChildren() {
Expand All @@ -73,8 +73,8 @@ export default {
},
viewMode() {
return this.$store.state.viewMode
}
}
},
},
}
</script>
<style>
Expand Down
10 changes: 5 additions & 5 deletions src/components/Breadcrumbs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export default {
props: {},
data() {
return {
url: ''
url: '',
}
},
computed: {
Expand All @@ -99,7 +99,7 @@ export default {
},
selection() {
return this.$store.state.selection.bookmarks
}
},
},
created() {},
methods: {
Expand All @@ -124,7 +124,7 @@ export default {
onToggleViewMode() {
this.$store.dispatch(actions.SET_SETTING, {
key: 'viewMode',
value: this.$store.state.viewMode === 'grid' ? 'list' : 'grid'
value: this.$store.state.viewMode === 'grid' ? 'list' : 'grid',
})
},
Expand All @@ -134,8 +134,8 @@ export default {
},
onBulkMove() {
this.$store.commit(mutations.DISPLAY_MOVE_DIALOG, true)
}
}
},
},
}
</script>
<style>
Expand Down
10 changes: 5 additions & 5 deletions src/components/CreateBookmark.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ export default {
components: { Actions, ActionButton },
data() {
return {
url: ''
url: '',
}
},
computed: {
creating() {
return this.$store.state.loading.createBookmark
}
},
},
mounted() {
this.$refs['input'].focus()
Expand All @@ -43,10 +43,10 @@ export default {
submit() {
this.$store.dispatch(actions.CREATE_BOOKMARK, {
url: this.url,
...(this.$route.name === 'folder' && { folders: [this.$route.params.folder] })
...(this.$route.name === 'folder' && { folders: [this.$route.params.folder] }),
})
}
}
},
},
}
</script>
<style>
Expand Down
10 changes: 5 additions & 5 deletions src/components/CreateFolder.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ export default {
components: { Actions, ActionButton },
data() {
return {
title: ''
title: '',
}
},
computed: {
loading() {
return this.$store.state.loading.createFolder
}
},
},
mounted() {
this.$refs['input'].focus()
Expand All @@ -45,10 +45,10 @@ export default {
const parentFolder = this.$route.params.folder
this.$store.dispatch(actions.CREATE_FOLDER, {
parentFolder,
title: this.title
title: this.title,
})
}
}
},
},
}
</script>
<style>
Expand Down
12 changes: 6 additions & 6 deletions src/components/Folder.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,21 @@ export default {
name: 'Folder',
components: {
Actions,
ActionButton
ActionButton,
},
props: {
folder: {
type: Object,
required: true
}
required: true,
},
},
data() {
return { renaming: false, title: this.folder.title }
},
computed: {
viewMode() {
return this.$store.state.viewMode
}
},
},
created() {},
methods: {
Expand All @@ -84,8 +84,8 @@ export default {
this.folder.title = this.title
this.$store.dispatch(actions.SAVE_FOLDER, this.folder.id)
this.renaming = false
}
}
},
},
}
</script>
<style>
Expand Down
10 changes: 5 additions & 5 deletions src/components/MoveDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default {
name: 'MoveDialog',
components: {
Modal,
TreeFolder
TreeFolder,
},
computed: {
showModal() {
Expand Down Expand Up @@ -55,7 +55,7 @@ export default {
this.selection.bookmarks.length
)
}
}
},
},
created() {},
methods: {
Expand All @@ -76,10 +76,10 @@ export default {
)
.map(child => ({
...child,
children: this.filterFolders(child.children)
children: this.filterFolders(child.children),
}))
}
}
},
},
}
</script>
<style>
Expand Down
Loading

0 comments on commit 3c75099

Please sign in to comment.