chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-10-05 02:53:40 +02:00
Code Activity
13,590 Commits 4 Branches 173 Tags
2.6.2-buildtest1
Commit Graph
6388 Commits
Author SHA1 Message Date
Olivier Goffart 7a82fac0d5 owncloudcmd: Save the selective sync list on the first run 
For issue #4690

In the first run, the journal might not exist, we should not cancel
setting the selective sync list
 2016-04-21 12:58:10 +02:00
Daniel Molkentin 8b39c6e6ce Merge pull request #4709 from owncloud/fix_4691 
Use QTokenizer to properly parse netrc
 2016-04-21 12:50:43 +02:00
Daniel Molkentin e29d7e0128 Use QTokenizer to properly parse netrc 
Addresses #4691
 2016-04-21 12:46:03 +02:00
Olivier Goffart 522f7afa9e Merge pull request #4663 from 'ckamm/disabletransmissionchecksum' 
Disable validation of transmission checksums by default
 2016-04-21 11:46:01 +02:00
Olivier Goffart fa69d089cf Checksums: remove the downloadChecksumValidationEnabled option 
Added in previous commit from pull request #4663

As discussed, we do not need this option so no need to introduce
a new dependency on the config file in the sync engine
 2016-04-21 11:43:44 +02:00
Klaas Freitag b56919d0c4 SocketAPI: Return NOP state if folder is diconnected or paused. 
Later, we can send a specific state for that.
 2016-04-20 17:14:12 +02:00
Markus Goetz f9fb7a59dd Merge pull request #4708 from owncloud/aliasGui 
UI: Remove alias from more places #4577 #4695
 2016-04-20 15:54:05 +02:00
Markus Goetz 1a51b6718a UI: Remove alias from more places #4577 #4695 2016-04-20 14:27:50 +02:00
Klaas Freitag bd37eab3ad SocketAPI: Display a warning on the directory if there are errors 
Errors with individual files within a directory now result in
a warning label on the parent directories.
 2016-04-19 18:18:00 +02:00
Markus Goetz edb942ba61 Merge pull request #4696 from owncloud/issue4573_negative_content_length 
Discovery: Be more explicit about files with unknown size #4573
 2016-04-19 16:09:48 +02:00
Markus Goetz a17f37d8ae Discovery: Be more explicit about files with unknown size #4573 
Also related https://github.com/owncloud/core/issues/23468
 2016-04-19 15:31:16 +02:00
Roeland Jago Douma 598941948c Use expireDate if returned by the OCS Share API 
If an app modifies the expiration date (for example the password policy
app) then on more recent versions of the server we will get the share
object back REST style. We should use that info!

Fixes #4409
 2016-04-19 11:22:32 +02:00
Roeland Douma 9f30e83413 Merge pull request #4687 from owncloud/fix_share-permissions-namespace 
The share-permissions namespace was moved
 2016-04-18 21:29:26 +02:00
Klaas Freitag 2ab4caf007 ProtocolWidget: Display the recalculated number of issues. 
Should fix #3222
 2016-04-18 16:48:37 +02:00
Klaas Freitag 11d3aa3c4f Protocolwidget: Removed some leftovers from refactoring. 2016-04-18 16:47:14 +02:00
Daniel Molkentin c0ec481436 No need for WebKitWidgets in libsync anymore 2016-04-16 10:58:12 +02:00
Klaas Freitag 0f3d6d4160 SyncFileStatusTracker: Add a method to handle the root item. 2016-04-15 15:02:02 +02:00
Olivier Goffart fafca26144 AccountManager: take theURL from the Theme rather than from the config if the theme specify it (#4591) 
That way an upgrade of the client can actually change the URL
Issue https://github.com/owncloud/enterprise/issues/1113
https://github.com/owncloud/enterprise/issues/1126

In addition to restoring commit 7e5d89293d, this
add a way to override the auth type
 2016-04-15 13:16:49 +02:00
Markus Goetz 06c19b0b6f sqlite: Update to version 3.12.1 
For OS X and Windows.
 2016-04-15 12:02:00 +02:00
Christian Kamm ea40e314d4 Add server capabilities for checksums #4638 
* Add checksums/supportedTypes and checksums/preferredUploadType
  capabilities. The default is that no checksum types are supported.

* Remove the transmissionChecksum config option. Servers must now
  use the capabilities to indicate that they are fine with the
  client sending checksums.

Note: This intentionally breaks brandings that overrode
Theme::transmissionChecksum. The override must be removed and the
server's capabilities must be adjusted to include the new values.
 2016-04-15 10:58:14 +02:00
Klaas Freitag e2622310df Merge pull request #4670 from owncloud/implement_ep_1136_2nd_attempt 
Make postfixlineedit more userfriendly, rename email id string to "Email"
 2016-04-15 10:17:03 +02:00
Klaas Freitag 4ad8e04bc3 Merge pull request #4684 from owncloud/less_socket_api_updates 
Less socket api updates
 2016-04-15 10:15:07 +02:00
Roeland Jago Douma 74301e4373 The share-permissions namespace was moved 
See https://github.com/owncloud/core/pull/24017

This was done since other services we want to intergrate with don't use
the ownCloud namespace.
 2016-04-15 10:14:05 +02:00
Klaas Freitag 8007331462 SocketAPI: Remove unneeded logging. 2016-04-14 15:39:46 +02:00
Klaas Freitag 12330b38e9 Folderman: Remove one call to updateFolderView. 
The reason is that updateFolderView is invoked by the
emitted signal folderSyncStateChange() anyway.

This will reduce the traffic over the SocketAPI nicely,
maybe this was the reason why it was slower than before.
 2016-04-14 15:26:11 +02:00
Christian Kamm dfd7d4d2f9 Activity tab visibility fixes #4651 2016-04-14 11:35:16 +02:00
Christian Kamm 484a2c800d Fix typo 2016-04-14 10:59:40 +02:00
Christian Kamm 8d300b049f ShareDialog: Tell a user early if resharing is impossible #4679 2016-04-14 10:16:37 +02:00
ckamm 48e594ebbf Merge pull request #4673 from ckamm/shareperm 
Disable unavailable sharing permissions #4383
 2016-04-14 09:44:58 +02:00
Christian Kamm 910c61b492 Disable unavailable sharing permissions #4383 
Users can't reshare with more permissions than they have themselves.
 2016-04-14 09:44:37 +02:00
Daniel Molkentin 97a6d3df82 document Theme::wizardUrlHint() 2016-04-13 15:59:25 +02:00
Daniel Molkentin 9cc981c8c7 Make postfixlineedit more userfriendly, rename email id string to "Email". 2016-04-13 14:56:49 +02:00
Klaas Freitag ed3203d25d Merge pull request #4659 from owncloud/fix_client_4651 
Fix client #4651
 2016-04-13 12:02:45 +02:00
Klaas Freitag 15988c6fda SocketAPI: Use NOP only, not NONE in the share api protocol. 
Otherwise, plugins might brake, as the linux one did.
 2016-04-12 18:28:27 +02:00
Klaas Freitag f443377978 Merge pull request #4664 from ckamm/hiddenfiles 
Fix hidden file handling #4655
 2016-04-12 17:14:47 +02:00
Olivier Goffart fdcdddca16 CMakeLists: move QtKeychain detection in client 2016-04-12 14:43:26 +02:00
Klaas Freitag bf99306a53 Merge branch 'do_not_close_db_on_done' 2016-04-12 14:36:46 +02:00
Christian Kamm 6f454feb39 Fix hidden file handling #4655 
There were two issues:

* With the refactoring of how Folder and SyncEngine relate, the
  ignore_hidden_files flag on the CSync context was reset after
  each sync run and not updated from the configuration again.

* The folder watcher failed to enumerate hidden folders and thus
  didn't watch for changes inside them. (linux only)
 2016-04-12 11:59:07 +02:00
Olivier Goffart 68b7437afb Merge pull request #4658 from owncloud/fix-qt4-build 
Fix qt4 build
 2016-04-12 10:36:48 +02:00
Christian Kamm 41b950b7e6 Don't call reset() on a query after close() #4662 2016-04-12 10:30:46 +02:00
Klaas Freitag 868edb1f0d SyncJournalDb: Only close the db if the return code is not SQLITE_DONE 
SQLITE_DONE is the indicator for not more query results, which is a legal
thing and not an error condition.

Also, check _getFileRecordQuery for null pointer, as close() wipes it.
 2016-04-11 17:38:16 +02:00
Klaas Freitag aaf43bd0d3 SyncJournalDb: Handle empty filename and avoid a bogus db query. 2016-04-11 17:36:15 +02:00
Klaas Freitag d5f1d1c6b2 SqlQuery: Add method errorId() to get the numeric error code. 2016-04-11 17:34:59 +02:00
Klaas Freitag 6cb94e8849 Merge pull request #4656 from owncloud/close_journal_fix 
Close journal fix - do not keep the journal open or reopen on error.
 2016-04-11 16:14:17 +02:00
Klaas Freitag d433c24186 Check if the record returned from getFileRecord is valid. 
Handle database fails properly.
 2016-04-11 16:04:20 +02:00
Olivier Goffart c48b5c4f61 ActivityWidget: use a QHash for _widgetsToRemove 
The problem with QSet is that the QDateTime was part of
the hash, but that does not make sens as it should be unique
per widget and not per <date, widget>

Instead make it a QHash so there is only one entry per widget.
 2016-04-11 15:49:24 +02:00
Olivier Goffart 976f4dfabe ActivityWidget: Fix Qt4 build 
Don't use API added in Qt5
 2016-04-11 15:49:24 +02:00
Olivier Goffart f8dc263338 CMakeLists: fix Qt4 build 
Only the src subdirectory needs Qt.
Otherwise it activates Qt4 also for the dolphin plugin which always need Qt5
 2016-04-11 15:49:18 +02:00
Klaas Freitag e896d16f32 ActivityWidget: Make sure Notification are visible if Activity disabled 
This is the fix for #4651
 2016-04-11 15:39:25 +02:00
Klaas Freitag 2ec642aadb ActivityWidget: Properly set widget for the Scrollview. 
Also fixed some SizePolicy settings.
 2016-04-11 15:38:25 +02:00