chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-08-20 22:27:09 +02:00
Code Activity
17,214 Commits 4 Branches 173 Tags
v3.4.0-do-not-use
Commit Graph
17214 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Goetz a76ba06817 Merge pull request #4389 from Bottswana/deleteprompt 
Add option to disable the delete all files prompt
 2016-02-22 15:44:50 +01:00
Markus Goetz 86fb83261a Merge pull request #4470 from RealRancor/chunksize_config 
Add chunkSize config to documentation
 2016-02-22 15:43:12 +01:00
Roeland Jago Douma cf0762a067 Lock the sharee input when sharing 
This prevents accidentally sharing with the same sharee multiple times.
Because creating shares is not instance.

Fixes #4469
 2016-02-22 15:14:05 +01:00
Roeland Jago Douma 99b3b752e3 Add theming options control sharing operations 
Fixes #4325
 2016-02-22 13:53:45 +01:00
Markus Goetz 5d7aa792e7 SyncEngine: Improve error message for ignored files/folders #4143 2016-02-22 11:13:29 +01:00
Hefee 28b694b170 Merge branch '2.1' 2016-02-20 10:34:34 +01:00
Hefee 74f74e0363 fix typo occured->occurred 2016-02-20 10:33:13 +01:00
Jenkins for ownCloud 64ca8a668a [tx-robot] updated from transifex 2016-02-20 01:15:28 -05:00
Daniel Molkentin bd72408e7a Merge pull request #4488 from owncloud/21-updates 
doc updates for 2.1.1 release
 2016-02-19 09:16:37 +01:00
Carla Schroder a32381a2a4 doc updates for 2.1.1 release 2016-02-18 10:31:51 -08:00
Daniel Molkentin 841973d399 Use correct values for items in version.rc 2016-02-17 14:16:29 +01:00
Jenkins for ownCloud cf47523b2c [tx-robot] updated from transifex 2016-02-17 02:19:09 -05:00
Daniel Molkentin 2918e45343 Add comment, transliterate copyright symbol 2016-02-16 17:56:51 +01:00
Daniel Molkentin e3b56fb559 Add file description, copyright to win32 VERSIONINFO struct 2016-02-16 16:19:12 +01:00
Jenkins for ownCloud 667f2a7c4c [tx-robot] updated from transifex 2016-02-16 02:19:01 -05:00
Klaas Freitag e846b36bf6 Tests: Add a test for the timeAgoInWords function 2016-02-15 17:59:24 +01:00
Klaas Freitag 7f18d087e6 Utility: Make the timeAgoInWords method a bit more verbose 2016-02-15 17:59:24 +01:00
Klaas Freitag 3cc9019b37 ActivityWidget: Set timespec to UTC for JSON values. 
This will fix the problem in #4439 that the time display
jumps if the timezone is changed on windows.
 2016-02-15 17:59:24 +01:00
Daniel Molkentin 37924b9c7f Win32: More complete resource specification 
Add application and vendor name

Addresses #4473
 2016-02-15 15:51:48 +01:00
Jenkins for ownCloud a6c2ccc6cc [tx-robot] updated from transifex 2016-02-15 02:19:06 -05:00
Jenkins for ownCloud c84051c737 [tx-robot] updated from transifex 2016-02-14 02:18:43 -05:00
Jenkins for ownCloud fe24ba55c4 [tx-robot] updated from transifex 2016-02-13 02:18:44 -05:00
RealRancor ed06fc51a0 Add chunkSize config to documentation 2016-02-12 11:34:27 +01:00
Jenkins for ownCloud 14de3b460b [tx-robot] updated from transifex 2016-02-12 02:18:46 -05:00
Olivier Goffart dd89ab59e4 Use oc:size instead of quota-used-bytes to get the sizes of folder (#4459) 2016-02-11 15:09:47 +01:00
Olivier Goffart cd83772112 SyncJounral: add an index on the error blacklist table 
https://github.com/owncloud/enterprise/issues/1035
 2016-02-11 14:38:38 +01:00
Jenkins for ownCloud 83adb7b55b [tx-robot] updated from transifex 2016-02-11 02:19:16 -05:00
Daniel Molkentin 49ba58e991 Merge pull request #4461 from owncloud/bump-year-to-2016 
Bump year to 2016
 2016-02-10 20:01:54 +01:00
Lukas Reschke 7db3bc91b5 Bump year to 2016 
My yearly contribution to the client 😉
 2016-02-10 19:52:55 +01:00
Olivier Goffart c93ecfbfb5 Merge branch restore_backup 2016-02-10 17:47:06 +01:00
Olivier Goffart 893e22691d ConnectionValidator: Make sure we intercept propfind error 
If the PROPFIND return an invalid code (like 200) then we would
not recieve the error signal and we would never sync again.

Found while investigating https://github.com/owncloud/enterprise/issues/1068
 2016-02-10 15:38:21 +01:00
Daniel Molkentin 41d8d77535 Merge remote-tracking branch 'origin/2.1' 2016-02-10 12:57:03 +01:00
Olivier Goffart e9307bb797 Use a constant for ConnectionValidator::DefaultCallingIntervalMsec 
So there is no runtime initialization
 2016-02-10 12:36:09 +01:00
Daniel Molkentin c98bf174ed ChangeLog: Set release date 2016-02-09 15:57:01 +01:00
Klaas Freitag ae3b9f112c Linux shell integration: Do not call sed from absolute path. 
sed is in /bin/ rather than in /usr/bin on some systems, which
makes the scripts fail in the build environment. sed should be
in the PATH tough.
 2016-02-09 13:01:03 +01:00
Jenkins for ownCloud 7fd9e751e0 [tx-robot] updated from transifex 2016-02-09 02:18:41 -05:00
Klaas Freitag 96f50d0c47 Nautilus integration: Remove Shebang from plugin source. 
This fixes #4436
 2016-02-08 17:00:39 +01:00
Jenkins for ownCloud 95a58e74ca [tx-robot] updated from transifex 2016-02-08 10:11:58 -05:00
Klaas Freitag b70a95ba30 nsi translations: finally escape the NSIS lineends correctly. 
This will now finally fix #3519
 2016-02-08 16:11:18 +01:00
Daniel Molkentin 72e14643f7 Update ChangeLog 2016-02-08 15:55:29 +01:00
Olivier Goffart 93308faeb9 Merge remote-tracking branch 'origin/2.1' 
Conflicts:
	doc/building.rst
 2016-02-08 14:28:25 +01:00
Jocelyn Turcotte f140d3447c OS X: Fix the file system watcher ignoring unicode paths #4424 
Add a missing string normalization when fetching the path
from the file system event.
 2016-02-08 13:30:08 +01:00
Olivier Goffart 16ab3ca6a6 Merge pull request #4437 from owncloud/dev/doninstalltests 
Don't install tests and cmocka lib
 2016-02-08 12:35:29 +01:00
Olivier Goffart 6b643c7501 Discovery: don't ignore recall file #4420 
The ".sys.admin#recall#" is the recall file and should not be ignored
even if hidden.

The remote discovery do not need to detect hidden files because it
is already detected by csync in all cases. So this avoid code duplication
 2016-02-08 12:07:34 +01:00
Daniel Molkentin 24920a4ad1 update Changelog 2016-02-08 00:21:57 +01:00
Daniel Molkentin 65655584e9 Doc: Instruct to use sha256 for Authenticode signing 2016-02-06 15:01:31 +01:00
Klaas Freitag e397056d2e Enable replacement of strange substrings also for nsh files. 2016-02-05 17:59:34 +01:00
James Botting f442195b8a Remove option from GUI, leaving config option only. 2016-02-05 15:48:17 +00:00
Olivier Goffart 54a278edb9 fix compilation with TOKEN_AUTH_ONLY 2016-02-05 15:30:29 +01:00
Daniel Molkentin b0acc475b0 Bring build documentation up to date, use docker for Win32 xbuild 2016-02-05 14:55:29 +01:00