public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-15 18:56:22 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into monokai_theme

Browse Source
This commit is contained in:
William Grant
2018-04-27 09:06:11 +02:00
parent 239edb0605 2e3e0bc1d8
commit 5bd0499ae4
39 changed files with 816 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
browser/main/NoteList/index.js
View File

@@ -343,11 +343,10 @@ class NoteList extends React.Component {
}
if (location.pathname.match(/\/tags/)) {
const listOfTags = params.tagname.split(' ')
return data.noteMap.map(note => {
return note
}).filter(note => {
return note.tags.includes(params.tagname)
})
}).filter(note => listOfTags.every(tag => note.tags.includes(tag)))
}
return this.getContextNotes()
@@ -916,7 +915,7 @@ class NoteList extends React.Component {
if (note.isTrashed !== true || location.pathname === '/trashed') return true
})
moment.locale('en', {
moment.updateLocale('en', {
relativeTime: {
future: 'in %s',
past: '%s ago',