nextcloud-desktop-pachulo

nextcloud-desktop-pachulo:upstream/pr/6360

  1. Git
  2. lp:nextcloud-desktop-pachulo
  3. upstream/pr/6360
Last commit made on 2018-06-05
Get this branch:
git clone -b upstream/pr/6360 https://git.launchpad.net/nextcloud-desktop-pachulo

Branch merges

Branch information

Name:
upstream/pr/6360
Repository:
lp:nextcloud-desktop-pachulo

Recent commits

09f83f4... by Christian Kamm <email address hidden>

SyncJournal: Clear etag filter before sync

Before, we only cleared the _avoidReadFromDbOnNextSyncFilter *after* a
sync which meant that we had to sync twice after selective sync setup.

Now, we clear the filter *before* a sync as well which allows the actual
next sync to write the correct etags to the db again - instead of only
the sync after that one.

Also expand on comments and rename _avoidReadFromDbOnNextSyncFilter to
_etagStorageFilter.

3ce41c7... by Roeland Jago Douma <email address hidden>

Merge pull request #350 from nextcloud/upstream/pr/6436

SyncJournalDb::setSelectiveSyncList: Always use a transaction

613fd30... by Olivier Goffart <email address hidden>

SyncJournalDb::setSelectiveSyncList: Always use a transaction

Issue #6431

0afcb23... by Roeland Jago Douma <email address hidden>

Merge pull request #331 from nextcloud/upstream/pr/6412

Blacklisting must prevent parent etag updates #6411

c57e4dc... by Christian Kamm <email address hidden>

Blacklisting must prevent parent etag updates #6411

5309694... by Roeland Jago Douma <email address hidden>

Merge pull request #394 from nextcloud/fix/master/info

Fix output add E2E again

a0c458d... by Roeland Jago Douma <email address hidden>

Fix output add E2E again

Signed-off-by: Roeland Jago Douma <email address hidden>

a035b9b... by Roeland Jago Douma <email address hidden>

Merge pull request #393 from ivaradi/master

Re-encoded Ubuntu/Debian upload keys

92de077... by =?utf-8?b?SXN0dsOhbiBWw6FyYWRp?= <email address hidden>

Re-encoded Ubuntu/Debian upload keys

2eb87e7... by Roeland Jago Douma <email address hidden>

Merge pull request #330 from nextcloud/upstream/pr/6408

FolderStatusModel: fix potential assert