chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2025-10-31 00:17:15 +01:00
Code Activity
13,590 Commits 4 Branches 173 Tags
2.6.2-buildtest1
Commit Graph

13590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Kamm
ed5e413751 Share link: Update permission wording #6192 2018-06-05 19:46:04 +02:00
Roeland Jago Douma
7c4c3b0493 Merge pull request #349 from nextcloud/upstream/macOS 
macOS: build/installer changes
 2018-06-05 13:39:36 +02:00
Roeland Jago Douma
4ddbb35d77 Fix debian patch 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-05 13:29:51 +02:00
Markus Goetz
16bf765818 macOS: Don't hardcode path in Installer source 2018-06-05 13:29:51 +02:00
Markus Goetz
5667408c58 macOS: Offer only standard installation in installer 2018-06-05 13:29:51 +02:00
Markus Goetz
a0e17ce221 create_mac.sh: Also name properly in source dir 2018-06-05 13:29:51 +02:00
Markus Goetz
3defc30e12 macosx.pkgproj; This is a .cmake preprocessed file 2018-06-05 13:29:51 +02:00
Christian Kamm
09f83f4fa9 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.
 2018-06-05 12:00:20 +02:00
Roeland Jago Douma
3ce41c71c1 Merge pull request #350 from nextcloud/upstream/pr/6436 
SyncJournalDb::setSelectiveSyncList: Always use a transaction
 2018-06-05 11:30:24 +02:00
Olivier Goffart
613fd30021 SyncJournalDb::setSelectiveSyncList: Always use a transaction 
Issue #6431
 2018-06-05 11:15:51 +02:00
Roeland Jago Douma
0afcb23734 Merge pull request #331 from nextcloud/upstream/pr/6412 
Blacklisting must prevent parent etag updates #6411
 2018-06-05 10:18:53 +02:00
Christian Kamm
c57e4dcf03 Blacklisting must prevent parent etag updates #6411 2018-06-05 10:12:11 +02:00
Roeland Jago Douma
5309694b34 Merge pull request #394 from nextcloud/fix/master/info 
Fix output add E2E again
 2018-06-05 09:39:06 +02:00
Roeland Jago Douma
a0c458d937 Fix output add E2E again 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-05 09:02:41 +02:00
Roeland Jago Douma
a035b9b10b Merge pull request #393 from ivaradi/master 
Re-encoded Ubuntu/Debian upload keys
 2018-06-05 09:02:23 +02:00
István Váradi
92de0770bc Re-encoded Ubuntu/Debian upload keys 2018-06-05 08:34:41 +02:00
Roeland Jago Douma
2eb87e769c Merge pull request #330 from nextcloud/upstream/pr/6408 
FolderStatusModel: fix potential assert
 2018-06-05 08:19:01 +02:00
Olivier Goffart
f4f228de3e FolderStatusModel: fix potential assert 
OCC::FolderStatusModel::slotUpdateDirectories: ASSERT: "parentInfo->_fetching" in file /home/olivier/kdegit/owncloud/mirall/src/gui/folderstatusmodel.cpp, line 599

This can happen if the structure of a folder is change while the user
expands the root folder. In this case, resetSubs() is called which
resets _fetching to false.
Instead, we need to keep a pointer to the job so we can abort it by
deleting it.
 2018-06-05 08:12:58 +02:00
Roeland Jago Douma
6872cbda7e Merge pull request #329 from nextcloud/upstream/pr/6416 
csync_update: add the checksum in the discovery log
 2018-06-05 08:12:00 +02:00
Olivier Goffart
3e508329b5 csync_update: add the checksum in the discovery log 
Issue #6414
 2018-06-05 07:52:29 +02:00
Roeland Jago Douma
69aa077212 Merge pull request #338 from ivaradi/master 
Patch the OSX CMakeLists.txt for Xenial
 2018-06-05 07:51:46 +02:00
István Váradi
d0e4c67459 Merge branch 'master' of github.com:nextcloud/client 2018-06-05 06:58:12 +02:00
Nextcloud bot
f8d0cbd468 [tx-robot] updated from transifex 2018-06-05 00:47:52 +00:00
Roeland Jago Douma
dfed78a665 Merge pull request #328 from nextcloud/upstream/issue/5932 
macdeployqt: Adjust minimum version based on our Qt #5932
 2018-06-04 20:23:38 +02:00
Markus Goetz
0d182280c4 macdeployqt: Adjust minimum version based on our Qt #5932 2018-06-04 20:02:43 +02:00
Roeland Jago Douma
8477c5a565 Merge pull request #327 from nextcloud/upstream/pr/6271 
postinstall macOS: check if Finder is running
 2018-06-04 20:00:58 +02:00
Roeland Jago Douma
32ae670c4e Merge pull request #325 from nextcloud/upstream/ssl-button-speed 
SslButton: Improve speed (especially on macOS) #6031
 2018-06-04 17:14:38 +02:00
Roeland Jago Douma
4bd6f2b26d Merge pull request #323 from nextcloud/upstream/upload-finished-flag 
Upload: Simplify 'finished' flag
 2018-06-04 17:14:17 +02:00
Roeland Jago Douma
c1171d700e Merge pull request #322 from nextcloud/upstream/pr/6404 
Excludes: Expand doc, Desktop.ini only in root folder
 2018-06-04 17:13:23 +02:00
Roeland Jago Douma
3a1dc44ec8 Merge pull request #320 from nextcloud/upstream/issue/6403 
propagateuploadv1: don't finalize after a done()
 2018-06-04 17:12:52 +02:00
Roeland Jago Douma
3c3f3541d4 Merge pull request #291 from nextcloud/fixEncryptionDecryptionNonEmptyFolder 
Forbid to encrypt or decrypt a non-empty folder.
 2018-06-04 16:03:25 +02:00
Roeland Jago Douma
c49597d9d8 Merge pull request #319 from nextcloud/upstream/issue/4424 
Folder: normalize the local path.
 2018-06-04 16:02:49 +02:00
Roeland Jago Douma
321e8c0264 Merge pull request #317 from nextcloud/upstream/issue/3146 
SslButton: Add HTTP/2 info #3146
 2018-06-04 16:01:44 +02:00
Roeland Jago Douma
092063d348 Merge pull request #316 from nextcloud/upstream/pr/6384 
CSync Errors cleanup
 2018-06-04 15:59:45 +02:00
Olivier Goffart
393f6c2310 SyncEngine: remove the "CSync" wording from the error messages 
They are confusing for the user.
Example in issue #6274
 2018-06-04 15:41:38 +02:00
Olivier Goffart
5f30177bfc CSync: Remove unused error codes 
None of the removed ERRNO code were ever set.
So none of the removed error hapenned anymore
 2018-06-04 15:41:38 +02:00
Olivier Goffart
15e93c8a31 CSync: reconcile never returns an error 2018-06-04 15:41:38 +02:00
Olivier Goffart
be29fc2f69 csync: remove CSYNC_PARAM_ERROR 
It does not make sense to report such error to the user.
Its goal was to show invalid use of the csync API, but this is now done
with asserts.
 2018-06-04 15:41:38 +02:00
Olivier Goffart
0443f8dd4d csync: Simplify csync_walk_local_tree/csync_walk_remote_tree 
Small refactoring
 2018-06-04 15:41:38 +02:00
Tomaz Canabrava
9b74a596c6 Forbid to encrypt or decrypt a non-empty folder. 
The specs forbid the encryption or decryption of a
non empty folder. so...
1 - check for the sync status, if it's not synced return

as there's no way that I can say that there's items on the
server right now without waiting for the sync to finish

2 - verify if the folder is empty locally

as the user could have send some files to the folder.
 2018-06-04 15:33:01 +02:00
Julius Härtl
5df1af79c5 Merge pull request #377 from nextcloud/bugfix/noid/cloudprovidesr_314 
Fix cloudproviders after merging #314
 2018-06-04 15:32:36 +02:00
Morris Jobke
d35ea29ad2 Merge pull request #388 from nextcloud/documentation/macos-osx 
[documentation] Mac OS X is now macOS
 2018-06-04 14:10:55 +02:00
Marius Blüm
78bfae45ae Mac OS X is now macOS 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2018-06-04 11:44:03 +02:00
Markus Goetz
ab34f36836 owncloudsynclog: 1 MB -> 10 MB #6420 2018-06-03 23:09:23 +02:00
Roeland Jago Douma
f96206705a Merge pull request #315 from nextcloud/upstream/pr/6379 
Discovery: Error if properties are missing #6317
 2018-06-03 19:58:21 +02:00
Nextcloud bot
70d4c64d99 [tx-robot] updated from transifex 2018-06-03 00:48:45 +00:00
Roeland Jago Douma
4b1c6bb833 Fix cloudproviders after merging #314 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-02 20:46:10 +02:00
Roeland Jago Douma
1262cbf4ef Merge pull request #314 from nextcloud/upstream/pr/6373 
Make sure ignored and conflict files show up in the issues tab even with partial local discovery
 2018-06-02 20:20:19 +02:00
Nextcloud bot
b2433c8961 [tx-robot] updated from transifex 2018-06-02 00:46:48 +00:00
Julius Härtl
c9634d65aa Merge pull request #313 from nextcloud/upstream/pr/6380 
ConnectionValidator: change the minimum server version
 2018-06-01 15:43:19 +02:00