mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-23 05:25:50 +03:00
Code Issues Projects Releases Packages Wiki Activity
10324 commits 473 branches 255 tags 510 MiB
Commit graph

10324 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jenkins for ownCloud
dfca67b63a [tx-robot] updated from transifex 2016-12-11 02:18:27 +01:00
Jenkins for ownCloud
7dc6a3b89f [tx-robot] updated from transifex 2016-12-10 02:18:32 +01:00
Jocelyn Turcotte
f985111b62 Fix the log window not showing csync logs 
The csync log level was only set up on startup, and for log files.
Fix the issue by making Logger::isNoop rely on being explicitly activated
for the log window instead of relying on the presence of a connected
signal, and move the csync log level logic in Logger.
 2016-12-09 10:03:46 +01:00
Jocelyn Turcotte
e8d734b1c2 Fix the sync direction being wrong on MSVC 
The compiler seems to use signed enums and we need to reserve an extra
bit for the sign to avoid the 2 value to overflow and being interpreted
as -2 when read, and thus not being correctly compared to the full enum
value.
 2016-12-09 10:03:46 +01:00
Jenkins for ownCloud
a38864fcb4 [tx-robot] updated from transifex 2016-12-09 02:18:28 +01:00
Jenkins for ownCloud
47bab51474 [tx-robot] updated from transifex 2016-12-08 02:18:27 +01:00
Jocelyn Turcotte
d0d5b2b4ee Don't try to deploy the mng image format plugin on macOS 
Qt now only build it if the system library is available since libmng
isn't active enough to make its security reliable enough. We don't
use that image format ourselves anyway.
 2016-12-07 15:26:23 +01:00
Jocelyn Turcotte
36967122db Rebase Qt patches on 5.6 #3449 
Also get rid of the list of different version. We always only support one Qt version
for macOS and Windows, and the list of patches will be based on that supported
version.
 2016-12-07 15:26:23 +01:00
Jenkins for ownCloud
3fd67b9fb6 [tx-robot] updated from transifex 2016-12-07 02:18:34 +01:00
ckamm
5bef1aa402 Merge pull request #5045 from owncloud/dbjournal_per_account 
Allow a folder to be synced to several accounts. This changes the path of the sync journal file!
 2016-12-06 10:55:58 +01:00
Jenkins for ownCloud
de9ea19e7e [tx-robot] updated from transifex 2016-12-06 02:18:34 +01:00
Olivier Goffart
4ac2b764a4 libsync: Clear the upload info after several retries (#5345) 
Issue #5344
 2016-12-05 17:21:36 +01:00
Jenkins for ownCloud
0614cda337 [tx-robot] updated from transifex 2016-12-05 02:18:32 +01:00
Jenkins for ownCloud
9e895b9b3e [tx-robot] updated from transifex 2016-12-04 02:18:28 +01:00
Jenkins for ownCloud
f501211c63 [tx-robot] updated from transifex 2016-12-03 02:18:25 +01:00
Jenkins for ownCloud
77ac1b46dd [tx-robot] updated from transifex 2016-12-02 02:18:35 +01:00
Jenkins for ownCloud
745c21623c [tx-robot] updated from transifex 2016-12-01 02:18:28 +01:00
Jenkins for ownCloud
b91c116518 [tx-robot] updated from transifex 2016-11-30 02:18:34 +01:00
Felix Tiede
d090a3330a Generate .desktop file with OEM name directly. 
Instead of renaming the .desktop file at install time it is now
generated with its OEM name during configure time.
 2016-11-29 18:36:26 +01:00
Felix Tiede
d04e7841e2 Fix file installation source path. 
By default the file is copied from the source and not the build
directory which will fail with the configure-time built file.
 2016-11-29 18:36:26 +01:00
Felix Tiede
d7a4726544 Extend OEM configurability to dolphin desktop file. 
OEM configurability creates binaries with OEM names which the .desktop
file doesn't take into account and thus dolphin integration does not
work if OEM changes the binary's name(s).
These changes are now integrated into the .desktop file at compile time.
 2016-11-29 18:36:26 +01:00
Olivier Goffart
19d2677db1 libsync: use the new webdav url if the server reports it 
The rules to select the webdav url are now:

 - If the server reports that the new chunking algorithm is working,
   always use remote.php/dav/files/<username>
   This capability can be overriden with an environment variable

 - Otherwise, use the dav path provided by the theme, which defaults to
   remote.php/webdav

This means that with the newer server, the branding can no longer override
the webdav URL. If there is still an usecase for the branding to do so, we
need to find another way to override it. But it is now more complicated to
configure as might need include the username and need different endpoint
depending on the operations (chunks or not)

Issue #4007
 2016-11-29 16:16:20 +01:00
Christian Kamm
a139d1a279 FolderWizard: pass AccountPtr by const& 
For review of #5045
 2016-11-29 10:39:20 +01:00
Christian Kamm
13e624c38f Fix compilation with Qt < 5.1 
For review of #5045
 2016-11-29 10:39:08 +01:00
Christian Kamm
acb155503b Ensure the 'Sync paused' state is used after pausing #5290 2016-11-29 09:56:45 +01:00
Jenkins for ownCloud
4cb80b08a2 [tx-robot] updated from transifex 2016-11-29 02:18:28 +01:00
Jenkins for ownCloud
cd85b7c6d7 [tx-robot] updated from transifex 2016-11-28 02:18:33 +01:00
Olivier Goffart
109056e676 owncloudcmd: Don't put the password in the URL 
As the URL might be print on the logs.
Also don't change the scheme from http to owncloud.

This was required before when we were using neon through csync, but now that
we use QNAM for everything we don't need it. The credentials from the account
are used.
 2016-11-26 12:57:44 +01:00
Jenkins for ownCloud
51a1bea5de [tx-robot] updated from transifex 2016-11-26 02:18:36 +01:00
Christian Kamm
68f99bcc27 AccountSettings: Add a "Force sync now" context menu option 2016-11-25 14:23:56 +01:00
Christian Kamm
276985f6c3 Fix perl tests for sync journal db name 2016-11-25 13:21:34 +01:00
Jenkins for ownCloud
7523db354d [tx-robot] updated from transifex 2016-11-25 02:18:27 +01:00
Jenkins for ownCloud
4919c9e7b1 [tx-robot] updated from transifex 2016-11-24 02:18:38 +01:00
Christian Kamm
045498c71a Account: Rename user() to davUser() 
Avoids potential confusion with credentials->user()
 2016-11-23 17:08:17 +01:00
Christian Kamm
49f8143f00 Bugfixes for sync journal name generation and usage 
* Use 'user' value for journal name generation
* Save journal name in settings
* Make owncloudcmd choose the right db
 2016-11-23 16:48:15 +01:00
Christian Kamm
bea7241910 Don't wipe each journal on each start 2016-11-23 16:48:15 +01:00
Christian Kamm
61b4da944c Split folders configuration locations for backwards compatibility 2016-11-23 16:48:15 +01:00
Christian Kamm
6fe1868693 Always migrate .csync_journal to ._sync_xxx 2016-11-23 16:48:15 +01:00
Christian Kamm
9641c7a1e7 Rename sync journal to ._sync_xxx.db. 
The added underscore means that older clients will also ignore the
file.
 2016-11-23 16:48:15 +01:00
Christian Kamm
3e59a9b316 Merge branch 'master' into dbjournal_per_account 2016-11-23 16:47:56 +01:00
Markus Goetz
679ac0d26a Wizard: Show if server asks for client certificate #2799 #69 (#5261) 
This also nicely displays the 'Untrusted domain' message of oC.
The link to add a trusted domain (via web browser) is clickable.
 2016-11-23 11:43:15 +01:00
Markus Goetz
2e3a3bcf84 Folder: Make folder only accessible by user #5282 (#5315) 
Because on OS X the parent folder might not protect
against access.
 2016-11-23 11:05:41 +01:00
Jonathan Kawohl
ad437a49f9 Merge branch 'Kawohl-master' 
fix conflict
 2016-11-23 11:01:52 +01:00
Jonathan Kawohl
6b2282bf0d Merge branch 'master' of https://github.com/owncloud/client into Kawohl-master 
fix conflict
 2016-11-23 10:59:18 +01:00
Jonathan Kawohl
42aed56a5a Merge branch 'master' of https://gthub.com/Kawohl/client into Kawohl-master 
fix conflict
 2016-11-23 10:56:29 +01:00
Jonathan Kawohl
ca9ec46253 fixed note 2016-11-23 09:17:33 +01:00
Jonathan Kawohl
a92eec160a fixed review https://github.com/owncloud/client/pull/5259#pullrequestreview-9743725 2016-11-23 09:10:58 +01:00
Jenkins for ownCloud
cc91c42dfa [tx-robot] updated from transifex 2016-11-23 02:18:37 +01:00
Olivier Goffart
d22d0e7e30 Propagator: don't use dynamic_cast for QObject 
qobject_cast is better. (no need to use RTTI when we have QMetaObject
 2016-11-22 17:37:41 +01:00
Samuel
4998303c42 Fixing a typo on a message 
This refers to the message shown when copying the list of unsynced items on the activity tab
 2016-11-22 12:14:03 +01:00