]>
dgit.raspbian.org Git - nextcloud-desktop.git/log
Olivier Goffart [Tue, 26 Apr 2016 08:38:20 +0000 (10:38 +0200)]
QTokenizer: fix Qt4 build
QSharedPointer::reset is new in Qt5
Jenkins for ownCloud [Tue, 26 Apr 2016 06:19:11 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 25 Apr 2016 12:26:49 +0000 (08:26 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 24 Apr 2016 06:19:04 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 24 Apr 2016 05:15:28 +0000 (01:15 -0400)]
[tx-robot] updated from transifex
Carla Schroder [Fri, 22 Apr 2016 15:40:09 +0000 (08:40 -0700)]
Merge pull request #4704 from owncloud/doc_overlay_icons
Doc: Draft overlay icons
Roeland Douma [Fri, 22 Apr 2016 12:40:55 +0000 (14:40 +0200)]
Merge pull request #4717 from owncloud/fix_webdav_property
Only 1 : between namespace and property
Roeland Jago Douma [Fri, 22 Apr 2016 12:38:43 +0000 (14:38 +0200)]
Only 1 : between namespace and property
Jenkins for ownCloud [Fri, 22 Apr 2016 10:16:18 +0000 (06:16 -0400)]
[tx-robot] updated from transifex
Daniel Molkentin [Fri, 22 Apr 2016 10:05:15 +0000 (12:05 +0200)]
Merge pull request #4715 from owncloud/translate-desktop-ini
Adding new resource for the desktop.ini file
Daniel Molkentin [Fri, 22 Apr 2016 09:23:09 +0000 (11:23 +0200)]
Fix search & replace error in Dockerfile
Thomas Müller [Fri, 22 Apr 2016 08:58:57 +0000 (10:58 +0200)]
Adding new resource for the desktop.ini file
Olivier Goffart [Fri, 22 Apr 2016 08:09:07 +0000 (10:09 +0200)]
Theme: missing virtual keyword
Olivier Goffart [Fri, 22 Apr 2016 08:05:50 +0000 (10:05 +0200)]
Quota: Add branding option for the base folder (#4714)
As discussed on issue ##4460
Having the quote to be queried on subfolder is wrong in the generic case,
so add a branding option to configure it.
This partially reverts commit
ff4cdc3161ddbb74a0fe10f969043ff898fbb93a
Klaas Freitag [Fri, 22 Apr 2016 07:56:53 +0000 (09:56 +0200)]
Doc: Applied review feedback for overlay icon docs.
Klaas Freitag [Fri, 22 Apr 2016 07:47:06 +0000 (09:47 +0200)]
Merge pull request #4713 from owncloud/fix_win-sis
Fix sync to Windows deduplication enabled storages
Jenkins for ownCloud [Fri, 22 Apr 2016 06:19:11 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Klaas Freitag [Thu, 21 Apr 2016 13:41:34 +0000 (15:41 +0200)]
Windows VIO: Remove unused variable.
Klaas Freitag [Wed, 20 Apr 2016 12:15:38 +0000 (14:15 +0200)]
local_vio_win: Fix handling files that have been deduplicated
as part of Windows SIS or Data Deduplication. Fixes #4056
Klaas Freitag [Thu, 21 Apr 2016 13:01:11 +0000 (15:01 +0200)]
Merge pull request #4689 from owncloud/overlays_handle_root
SyncFileStatusTracker: Add a method to handle the root folder of the sync.
Also, handle new files put in the sync in the statustracker logic.
Klaas Freitag [Thu, 21 Apr 2016 12:54:13 +0000 (14:54 +0200)]
SocketAPI: Code simplifications as asked for in the review.
Klaas Freitag [Thu, 21 Apr 2016 11:56:08 +0000 (13:56 +0200)]
SyncFileStatusTracker: Remember the state of new files.
In the before-propagate slot, new files that wait to be
pushed to the server are remembered in the _syncProblems
map. That way, the parents show a sync icon properly as
asked for in #4682.
After the item has been transfered properly, the item is
removed from the map again because success is the default.
Olivier Goffart [Thu, 21 Apr 2016 10:52:05 +0000 (12:52 +0200)]
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
Daniel Molkentin [Thu, 21 Apr 2016 10:50:43 +0000 (12:50 +0200)]
Merge pull request #4709 from owncloud/fix_4691
Use QTokenizer to properly parse netrc
Daniel Molkentin [Wed, 20 Apr 2016 15:46:53 +0000 (17:46 +0200)]
Use QTokenizer to properly parse netrc
Addresses #4691
Daniel Molkentin [Thu, 21 Apr 2016 10:24:58 +0000 (12:24 +0200)]
Update doc and Dockerfile for 2.2 builds
Olivier Goffart [Thu, 21 Apr 2016 09:46:01 +0000 (11:46 +0200)]
Merge pull request #4663 from 'ckamm/disabletransmissionchecksum'
Disable validation of transmission checksums by default
Olivier Goffart [Thu, 21 Apr 2016 09:43:44 +0000 (11:43 +0200)]
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
Jenkins for ownCloud [Thu, 21 Apr 2016 06:19:12 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Klaas Freitag [Wed, 20 Apr 2016 15:14:12 +0000 (17:14 +0200)]
SocketAPI: Return NOP state if folder is diconnected or paused.
Later, we can send a specific state for that.
Klaas Freitag [Wed, 20 Apr 2016 15:13:06 +0000 (17:13 +0200)]
Nautilus plugin: Be more robust against new states from socketapi
Do not bail out if an unknown state comes from SocketApi
Klaas Freitag [Wed, 20 Apr 2016 15:12:21 +0000 (17:12 +0200)]
Nautilus plugin: Remove the bogus logging
Markus Goetz [Wed, 20 Apr 2016 13:54:05 +0000 (15:54 +0200)]
Merge pull request #4708 from owncloud/aliasGui
UI: Remove alias from more places #4577 #4695
Markus Goetz [Wed, 20 Apr 2016 12:27:50 +0000 (14:27 +0200)]
UI: Remove alias from more places #4577 #4695
Jenkins for ownCloud [Wed, 20 Apr 2016 06:19:08 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Carla Schroder [Tue, 19 Apr 2016 17:28:46 +0000 (10:28 -0700)]
a bit of editing on new section
Klaas Freitag [Tue, 19 Apr 2016 16:20:23 +0000 (18:20 +0200)]
Doc: Draft overlay icons
Klaas Freitag [Tue, 19 Apr 2016 16:18:00 +0000 (18:18 +0200)]
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.
Markus Goetz [Tue, 19 Apr 2016 14:09:48 +0000 (16:09 +0200)]
Merge pull request #4696 from owncloud/issue4573_negative_content_length
Discovery: Be more explicit about files with unknown size #4573
Markus Goetz [Mon, 18 Apr 2016 15:33:25 +0000 (17:33 +0200)]
Discovery: Be more explicit about files with unknown size #4573
Also related https://github.com/owncloud/core/issues/23468
Roeland Douma [Tue, 19 Apr 2016 11:14:04 +0000 (13:14 +0200)]
Merge pull request #4700 from owncloud/fix_4409
Use expireDate if returned by the OCS Share API
Roeland Jago Douma [Tue, 19 Apr 2016 09:22:32 +0000 (11:22 +0200)]
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
Jenkins for ownCloud [Tue, 19 Apr 2016 06:19:15 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Roeland Douma [Mon, 18 Apr 2016 19:29:26 +0000 (21:29 +0200)]
Merge pull request #4687 from owncloud/fix_share-permissions-namespace
The share-permissions namespace was moved
Klaas Freitag [Mon, 18 Apr 2016 14:48:37 +0000 (16:48 +0200)]
ProtocolWidget: Display the recalculated number of issues.
Should fix #3222
Klaas Freitag [Mon, 18 Apr 2016 14:47:14 +0000 (16:47 +0200)]
Protocolwidget: Removed some leftovers from refactoring.
Jenkins for ownCloud [Mon, 18 Apr 2016 06:19:02 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 17 Apr 2016 06:19:07 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Daniel Molkentin [Sat, 16 Apr 2016 08:57:48 +0000 (10:57 +0200)]
No need for WebKitWidgets in libsync anymore
Jenkins for ownCloud [Sat, 16 Apr 2016 06:19:16 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Markus Goetz [Fri, 15 Apr 2016 14:56:54 +0000 (16:56 +0200)]
OS X: Fix overlay installation on El Capitan #4650
The sleep is somehow needed, probably for pkg to rebuild its DB?
The case fix fixes a warning but did not fix the issue itself.
Klaas Freitag [Fri, 15 Apr 2016 13:02:02 +0000 (15:02 +0200)]
SyncFileStatusTracker: Add a method to handle the root item.
Markus Goetz [Fri, 15 Apr 2016 12:28:38 +0000 (14:28 +0200)]
Merge pull request #4683 from owncloud/fix4657
OS X: Allow ampersand in APPLICATION_NAME #4657
Olivier Goffart [Fri, 15 Apr 2016 11:16:49 +0000 (13:16 +0200)]
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
7e5d89293d7bd52ac42d026d34a8154fbbdf33bb , this
add a way to override the auth type
Markus Goetz [Fri, 15 Apr 2016 10:00:54 +0000 (12:00 +0200)]
sqlite: Update to version 3.12.1
For OS X and Windows.
Markus Goetz [Wed, 13 Apr 2016 13:40:18 +0000 (15:40 +0200)]
OS X: Allow ampersand in APPLICATION_NAME #4657
Christian Kamm [Tue, 12 Apr 2016 08:12:35 +0000 (10:12 +0200)]
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.
Klaas Freitag [Fri, 15 Apr 2016 08:17:03 +0000 (10:17 +0200)]
Merge pull request #4670 from owncloud/implement_ep_1136_2nd_attempt
Make postfixlineedit more userfriendly, rename email id string to "Email"
Klaas Freitag [Fri, 15 Apr 2016 08:15:07 +0000 (10:15 +0200)]
Merge pull request #4684 from owncloud/less_socket_api_updates
Less socket api updates
Roeland Jago Douma [Fri, 15 Apr 2016 08:14:05 +0000 (10:14 +0200)]
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.
Markus Goetz [Fri, 15 Apr 2016 07:22:39 +0000 (09:22 +0200)]
Merge pull request #4686 from owncloud/allow_0_mtime_files
CSync: Allow files with 0 mtime #1603
Jenkins for ownCloud [Fri, 15 Apr 2016 06:19:14 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Markus Goetz [Thu, 14 Apr 2016 16:26:41 +0000 (18:26 +0200)]
Exclude: .Trash-* trash folders #4600
Markus Goetz [Thu, 14 Apr 2016 16:12:37 +0000 (18:12 +0200)]
CSync: Allow files with 0 mtime #1603
I don't see a reason we should not allow this. We detect
a "failed stat reply" in other ways. Maybe this was a legacy
csync decision somewhow that is not valid anymore?
Klaas Freitag [Thu, 14 Apr 2016 13:39:46 +0000 (15:39 +0200)]
SocketAPI: Remove unneeded logging.
Klaas Freitag [Thu, 14 Apr 2016 13:26:11 +0000 (15:26 +0200)]
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.
Klaas Freitag [Thu, 14 Apr 2016 13:24:46 +0000 (15:24 +0200)]
nautilus integration: Handle NOP as empty.
Christian Kamm [Thu, 14 Apr 2016 09:35:16 +0000 (11:35 +0200)]
Activity tab visibility fixes #4651
Christian Kamm [Thu, 14 Apr 2016 08:59:40 +0000 (10:59 +0200)]
Fix typo
Christian Kamm [Thu, 14 Apr 2016 08:03:15 +0000 (10:03 +0200)]
ShareDialog: Tell a user early if resharing is impossible #4679
ckamm [Thu, 14 Apr 2016 07:44:58 +0000 (09:44 +0200)]
Merge pull request #4673 from ckamm/shareperm
Disable unavailable sharing permissions #4383
Christian Kamm [Wed, 30 Mar 2016 09:33:34 +0000 (11:33 +0200)]
Disable unavailable sharing permissions #4383
Users can't reshare with more permissions than they have themselves.
Jenkins for ownCloud [Thu, 14 Apr 2016 06:19:23 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Daniel Molkentin [Wed, 13 Apr 2016 13:59:25 +0000 (15:59 +0200)]
document Theme::wizardUrlHint()
Olivier Goffart [Wed, 13 Apr 2016 13:05:04 +0000 (15:05 +0200)]
Dolphin Plugin: rename the files to the branded name #4669 (#4672)
Daniel Molkentin [Tue, 12 Apr 2016 14:24:06 +0000 (16:24 +0200)]
Make postfixlineedit more userfriendly, rename email id string to "Email".
Klaas Freitag [Wed, 13 Apr 2016 10:02:45 +0000 (12:02 +0200)]
Merge pull request #4659 from owncloud/fix_client_4651
Fix client #4651
Jenkins for ownCloud [Wed, 13 Apr 2016 06:19:05 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Klaas Freitag [Tue, 12 Apr 2016 16:27:32 +0000 (18:27 +0200)]
SocketAPI: Use NOP only, not NONE in the share api protocol.
Otherwise, plugins might brake, as the linux one did.
Klaas Freitag [Tue, 12 Apr 2016 15:14:47 +0000 (17:14 +0200)]
Merge pull request #4664 from ckamm/hiddenfiles
Fix hidden file handling #4655
Olivier Goffart [Tue, 12 Apr 2016 12:43:04 +0000 (14:43 +0200)]
CMakeLists: move QtKeychain detection in client
Klaas Freitag [Tue, 12 Apr 2016 12:36:46 +0000 (14:36 +0200)]
Merge branch 'do_not_close_db_on_done'
Christian Kamm [Tue, 12 Apr 2016 11:42:57 +0000 (13:42 +0200)]
Fix unit test build
Christian Kamm [Tue, 12 Apr 2016 10:45:20 +0000 (12:45 +0200)]
Explicitly depend on Qt5Test.
Christian Kamm [Tue, 12 Apr 2016 09:49:52 +0000 (11:49 +0200)]
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)
Olivier Goffart [Tue, 12 Apr 2016 08:36:48 +0000 (10:36 +0200)]
Merge pull request #4658 from owncloud/fix-qt4-build
Fix qt4 build
Christian Kamm [Tue, 12 Apr 2016 08:30:22 +0000 (10:30 +0200)]
Don't call reset() on a query after close() #4662
Jenkins for ownCloud [Tue, 12 Apr 2016 06:19:13 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Klaas Freitag [Mon, 11 Apr 2016 15:38:16 +0000 (17:38 +0200)]
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.
Klaas Freitag [Mon, 11 Apr 2016 15:36:15 +0000 (17:36 +0200)]
SyncJournalDb: Handle empty filename and avoid a bogus db query.
Klaas Freitag [Mon, 11 Apr 2016 15:34:59 +0000 (17:34 +0200)]
SqlQuery: Add method errorId() to get the numeric error code.
Klaas Freitag [Mon, 11 Apr 2016 14:14:17 +0000 (16:14 +0200)]
Merge pull request #4656 from owncloud/close_journal_fix
Close journal fix - do not keep the journal open or reopen on error.
Klaas Freitag [Mon, 11 Apr 2016 10:41:26 +0000 (12:41 +0200)]
Check if the record returned from getFileRecord is valid.
Handle database fails properly.
Olivier Goffart [Mon, 11 Apr 2016 13:27:29 +0000 (15:27 +0200)]
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.
Olivier Goffart [Mon, 11 Apr 2016 13:26:57 +0000 (15:26 +0200)]
ActivityWidget: Fix Qt4 build
Don't use API added in Qt5
Olivier Goffart [Mon, 11 Apr 2016 13:25:49 +0000 (15:25 +0200)]
CMakeLists: fix Qt4 build
Only the src subdirectory needs Qt.
Otherwise it activates Qt4 also for the dolphin plugin which always need Qt5
Klaas Freitag [Mon, 11 Apr 2016 13:39:25 +0000 (15:39 +0200)]
ActivityWidget: Make sure Notification are visible if Activity disabled
This is the fix for #4651
Klaas Freitag [Mon, 11 Apr 2016 13:38:25 +0000 (15:38 +0200)]
ActivityWidget: Properly set widget for the Scrollview.
Also fixed some SizePolicy settings.
Olivier Goffart [Mon, 11 Apr 2016 13:36:46 +0000 (15:36 +0200)]
Merge pull request #4648 from owncloud/handle-database-errors
Handle setFileRecord errors #4632
Olivier Goffart [Thu, 7 Apr 2016 09:47:04 +0000 (11:47 +0200)]
Handle setFileRecord errors #4632