Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
robert7 committed Nov 6, 2018
2 parents 99c0a56 + f069bb5 commit a7c53be
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 2 additions & 3 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
NixNote (2.1.0-beta5b) unstable; urgency=low
NixNote (2.1.0) stable; urgency=low
* Minor logging improvement in case app is run from wrong directory.
* Added sort by "tags" option
* Added "Date" mime mail header field (applied patch by https://github.com/the02, Issue #52)
* Fixed problem with "Could not parse stylesheet of object XY" warning (invalid default css for searchInputCss)
-- Robert Spiegel <[email protected]> Tue, 30 Oct 2018 12:00:00 -0400

-- Robert Spiegel <[email protected]> Tue, 6 Nov 2018 12:00:00 -0400

NixNote (2.1.0-beta4) unstable; urgency=low
* Make the sync and email shortcut key global to all app windows, and add sync and email toolbar buttons to
Expand Down
2 changes: 2 additions & 0 deletions src/communication/communicationmanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,8 @@ qint32 CommunicationManager::expungeNotebook(Guid guid) {

// Upload a note to Evernote
qint32 CommunicationManager::uploadNote(Note &note, QString token) {
QLOG_DEBUG() << "uploadNote " << note.guid << ", " << note.title;

if (token == "") {
token = authToken;
}
Expand Down

0 comments on commit a7c53be

Please sign in to comment.