chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-10-31 02:42:49 +01:00
Code
16,106 Commits 4 Branches 173 Tags 91 MiB
v3.2.0-rc1
Commit Graph

16106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Olivier Goffart
03e3b3bf50 Upload: put the job in the active list while doing the checksum computation. 
This fixes an issue in which too many jobs are started un parallel
while uploading many files, which could cause too much memory usage as the
chunks are stored in memory.

Probably the fix for #4611
 2016-05-20 16:28:27 +02:00
Christian Kamm
9aed8dbce8 Checksums: Compute content checksum on download #4375 
Cherry-picked from d6d35029
 2016-05-20 16:06:30 +02:00
ckamm
c6794cd338 Progress info: Reset between syncs #4856 (PR #4872) 2016-05-20 15:07:54 +02:00
Jenkins for ownCloud
65ec1b74d5 [tx-robot] updated from transifex 2016-05-20 02:19:16 -04:00
ckamm
567fe87e98 Use natural sorting for filenames if available #4859 (#4864) 2016-05-19 15:36:46 +02:00
Christian Kamm
a1ba23eea9 Activity: When a new notification arrives, switch to that tab #4805 2016-05-19 14:13:07 +02:00
Jenkins for ownCloud
1a3c9a9c1a [tx-robot] updated from transifex 2016-05-19 02:19:20 -04:00
Markus Goetz
a038c99232 Upload: Remove bandwidth quota debug message #4837 2016-05-18 16:18:13 +02:00
Olivier Goffart
30c8fa1c93 Utility: Fix translation of second, minute, hour 
Issue #4855

A typo in the context string made the translation lookup fail.
But also the %Ln was not recognized as a plural form by transifex, so only
the singular was translated
 2016-05-18 10:52:22 +02:00
Olivier Goffart
010649f997 FolderWizard: remove dead code and fix the alias 
Remove a bunch of dead code.

And also set the root folder name properly since alias is gone.

Fix the warning:
QWizard::field: No such field 'alias'
 2016-05-18 10:52:22 +02:00
Jenkins for ownCloud
597f2a4dfc [tx-robot] updated from transifex 2016-05-18 02:19:16 -04:00
Olivier Goffart
cf1fe690a3 Shibboleth: Show the inspector if OWNCLOUD_SHIBBOLETH_DEBUG is set 
Help to debug https://github.com/owncloud/enterprise/issues/1265
 2016-05-17 12:29:20 +02:00
Olivier Goffart
194db066b6 Merge remote-tracking branch 'origin/2.2' 2016-05-17 10:04:31 +02:00
Jenkins for ownCloud
31b27bea38 [tx-robot] updated from transifex 2016-05-17 02:18:59 -04:00
Jenkins for ownCloud
04f99f3bd7 [tx-robot] updated from transifex 2016-05-15 02:19:07 -04:00
Jenkins for ownCloud
fbf92ac239 [tx-robot] updated from transifex 2016-05-14 02:19:15 -04:00
hefee
669a72f0e1 A final release version number breaks this regex (#4835) 
f.ex. a valid verson nr: 2.2.0
-> fist \d+ = 2
-> second \d+ = 2
-> the last \d+ = 0
-> .+ in not matching, because there is nothing to match
 2016-05-13 16:55:11 +02:00
Jenkins for ownCloud
2f0e65d37c [tx-robot] updated from transifex 2016-05-13 02:25:05 -04:00
Olivier Goffart
5676685f58 SyncEngine: Add a compile option so we rename to restoring a move we don't have the permission to do 
IL issue 550
 2016-05-12 13:15:30 +02:00
Christian Kamm
db9ccb40a4 Fix compile with strict C flags 2016-05-12 13:14:40 +02:00
Christian Kamm
d4c15d2c38 Ignores: expand escapes #4568 
(cherry picked from commit d7bd1300a8)
 2016-05-12 11:53:17 +02:00
Hefee
edb3759684 For tests we do not need a xserver running. 
Use for tests QTEST_GUILESS_MAIN and QTEST_APPLESS_MAIN.
 2016-05-12 11:34:21 +02:00
Christian Kamm
0f9c32452c Protocol: Increase width of timestamp column #4721 
Since the font metrics aren't reliable on windows, we add some
extra space there.
 2016-05-12 10:24:34 +02:00
Daniel Molkentin
45dd1d0acf Bump to 2.2.1 2016-05-12 09:58:12 +02:00
Daniel Molkentin
552af7b94d 2.2.0 final 2016-05-12 09:58:12 +02:00
Christian Kamm
8934979ba1 timeAgo test: Fix for qt4, clean up 2016-05-12 09:25:15 +02:00
Daniel Molkentin
b3e16e0eb0 Merge pull request #4825 from owncloud/22-user-manual 
[Doc] 2.2 user manual updates
 2016-05-12 08:20:55 +02:00
Carla Schroder
7773380deb update file manager screenshot 2016-05-11 12:44:27 -07:00
Carla Schroder
e22050a434 updates to 2.2 user manual 2016-05-11 12:37:40 -07:00
Daniel Molkentin
7b0231bfce Merge pull request #4821 from owncloud/notification_doc 
Documentation draft to introduce notifications.
 2016-05-11 21:16:35 +02:00
Jocelyn Turcotte
edc58c045f Fix assert on restore after propagation (#4823) 
The assert was there to make sure that this case wasn't happening
to eventually be properly tested. Remove the assert for now but this
codepath should eventually be unit tested using this specific situation.
 2016-05-11 18:16:46 +02:00
Klaas Freitag
035058934f Documentation draft to introduce notifications. 
Also added a screenshot.
 2016-05-11 11:16:08 +02:00
Klaas Freitag
9b1f46e560 Fix exclude unit test, adopt to new Iface of isExcluded. 2016-05-10 16:46:08 +02:00
Klaas Freitag
9e7a8e619b Fix utility test: Pass a command name to do the version check. 2016-05-10 16:26:42 +02:00
Klaas Freitag
9c0cd2b13e Added Changelog for 2.2.0 2016-05-10 15:39:44 +02:00
Daniel Molkentin
58ad781bd4 Update binary submodule 2016-05-10 14:39:22 +02:00
Daniel Molkentin
9d6701ecbe Windows Shell Integration: Fix another spot where the pipe path was constructed manually 2016-05-10 13:49:14 +02:00
Daniel Molkentin
d659c54798 Update binary sub module 2016-05-10 10:36:49 +02:00
Daniel Molkentin
0e9170cb36 Windows Shell Integration: Unify path lookups 2016-05-10 10:18:53 +02:00
Markus Goetz
8820bc1c17 Windows: Fix Share menu #4781 2016-05-09 14:37:46 +02:00
Jenkins for ownCloud
74f67c97a9 [tx-robot] updated from transifex 2016-05-09 02:19:15 -04:00
Jenkins for ownCloud
fd96b482c5 [tx-robot] updated from transifex 2016-05-07 02:19:16 -04:00
Jocelyn Turcotte
727e73d640 [shell/windows] Fix the windows status push not working (#4784) 
Since the windows implementation first does cache lookups using the
path string, directories need to be passed identically as through
RETRIEVE_FILE_STATUS.

Change the convention to never have a trailing slash for directories
in the protocol. This allows the convention to be applied without
having to access the disk (since we'd need to know if the path is
represented by a directory) and also matches the convention of the
rest of the sync engine. Individual file manager plugins are then
responsible of handling pushed paths as not ending with a trailing
slash.

This also:
- Moves the trailing slash removal logic from the SyncFileStatusTracker
  to the SocketApi class
- Remove the unneeded QString::normalized call in fileStatus, since
  this should already be done by the FolderWatcher and plugins
 2016-05-06 12:32:01 +02:00
Jenkins for ownCloud
d7804d8df3 [tx-robot] updated from transifex 2016-05-06 02:19:00 -04:00
Olivier Goffart
3d9d106bb1 Dolphin plugin: fix build with branding 
Make sure that the name of the _export.h file is the same no matter the plugin
 2016-05-04 14:19:18 +02:00
Jenkins for ownCloud
15dc3408ef [tx-robot] updated from transifex 2016-05-04 02:19:15 -04:00
Markus Goetz
928643f597 NSIS: Properly uninstall both x64 and x86 DLLs #4762 
Viel hilft viel ;-)
 2016-05-03 18:35:01 +02:00
Markus Goetz
7110091fdd Qt patches: Update with information about Qt 5.6 2016-05-03 15:16:07 +02:00
Jocelyn Turcotte
064c2b678a Merge branch 'overlayIconFixes' into 2.2 (#4765) 2016-05-03 13:04:34 +02:00
Jocelyn Turcotte
e58739de00 [osx] Fix missing overlay icons on client startup 
Since the statuses are cached and that we can't invalidate the cache,
sending NOP would need to be overwritten by the default OK status
once the client successfully connected. But instead of remembering
which files we NOPed, rather wait until we are ready to sync before
sending the REGISTER_PATH message to the socket API client. It will
also prevent the client from sending unnecessary RETRIEVE_FILE_STATUS
requests.

Also remove AccountState::canSync, since it does the same as
isConnected and syncing is not an account responsibility.
 2016-05-03 13:01:51 +02:00