Olivier Goffart
172689d35c
Merge remote-tracking branch 'origin/2.3'
2017-02-14 15:08:10 +01:00
Jocelyn Turcotte
60a4a742a3
Disable tests uncompatible with Qt4 for that build
2017-02-14 14:32:41 +01:00
Jocelyn Turcotte
b26db062d2
Fix the UNIT_TESTING build on Windows
...
- Put all tests in the bin directory so that DLLs can be loaded
- Add missing exports
- Skip tests that use code depending on zlib
- The "GMT" timezone is named differently, use the int constructor instead
5 tests are still failing, it's not really worth fixing at the moment
since no developper is currently using Windows as its main platform.
2017-02-14 14:32:41 +01:00
Jocelyn Turcotte
611f633ba8
Fix FolderManTest on macOS
...
On macOS /var is a symlink to /private/var and we have to make sure that we
use the canonical path before and after it enters the code to make sure we
compare paths correctly.
2017-02-14 14:32:41 +01:00
Jocelyn Turcotte
3265948458
Fix ExcludedFilesTest on macOS
...
Use the same logic to find sync-exclude as check_csync_exclude.c
2017-02-14 14:32:41 +01:00
Jocelyn Turcotte
0e3e9d5991
Fix FileSystemTest on macOS
2017-02-14 14:32:41 +01:00
Jocelyn Turcotte
0be6cd3bf7
Fix FolderWatcherTest on macOS and Windows
...
- We need to use a QGuiApplication on macOS or else we don't get notifications
- Switch to use QSignalSpy rather than lists and sleeps
- Use system() for all modifications since we pass kFSEventStreamCreateFlagIgnoreSelf
- Keep using the local process on Windows since it catches its own events
2017-02-14 14:32:41 +01:00
Jocelyn Turcotte
867b78052d
Fix UtilityTest on macOS
2017-02-14 14:32:41 +01:00
Olivier Goffart
058f7df635
Folder: remove unused variable
2017-02-14 10:10:07 +01:00
Jenkins for ownCloud
c1552d7984
[tx-robot] updated from transifex
2017-02-14 02:18:27 +01:00
Markus Goetz
575b981542
Modify Jenkinsfile for 2.3
2017-02-13 14:47:51 +01:00
Jenkins for ownCloud
0d0af95956
[tx-robot] updated from transifex
2017-02-13 02:18:28 +01:00
Jenkins for ownCloud
6c5d873647
[tx-robot] updated from transifex
2017-02-12 02:18:28 +01:00
Jenkins for ownCloud
71187e1744
[tx-robot] updated from transifex
2017-02-11 02:18:34 +01:00
Christian Kamm
006ce854a6
Doc: For conflicts, the local file is renamed #5521
2017-02-10 12:50:35 +01:00
Jenkins for ownCloud
697178bab6
[tx-robot] updated from transifex
2017-02-10 02:18:29 +01:00
Jenkins for ownCloud
d8a86da377
[tx-robot] updated from transifex
2017-02-09 02:18:33 +01:00
Jocelyn Turcotte
d1dace9e7f
Remove unneeded Q_DECLARE_METATYPE
2017-02-08 17:57:20 +01:00
Jocelyn Turcotte
1cec2ca13d
Fix TestSyncEngine::abortAfterFailedMkdir
...
It could be possible that _firstJob is marked as finished if
aborted before its parent PropagateDirectory was marked as finished,
allowing a posted scheduleNextJob call to schedule the child job
in-between.
2017-02-08 17:32:04 +01:00
Jocelyn Turcotte
1d9e08d109
Skip TestSyncEngine::abortAfterFailedMkdir
2017-02-08 17:25:32 +01:00
ckamm
7879c470b3
Merge pull request #5518 from ckamm/asserts
...
Improve usage of asserts
2017-02-08 15:25:02 +01:00
Christian Kamm
3c7545a45f
CMake: Don't force-enable asserts #5429
...
Should be safer now that we've gone through asserts and assured that
one ones that should be fatal continue to exist in release builds
independently of QT_NO_DEBUG.
2017-02-08 15:15:19 +01:00
Christian Kamm
4c1fdf1dee
Double check usage of asserts #5429
...
A few are supposed to be fatal.
2017-02-08 15:15:19 +01:00
Christian Kamm
18e25122db
Performance: reserve() _remotePerm #5496
2017-02-08 15:06:09 +01:00
Olivier Goffart
439e688906
Folder: Change the wording for the massive deletion message
...
Issue #5503
2017-02-08 14:30:14 +01:00
ckamm
4198d9f420
Settings: Don't migrate settings on access error #5499 ( #5523 )
...
Previously, we'd try migrating from legacy settings if reading
the settings failed with an error. Now, we try again after a
couple of seconds and eventually give up.
2017-02-08 14:28:50 +01:00
Olivier Goffart
06579a5c70
AccountManager: Fix small leak in the account migration code
...
The QSettings object was not deleted in every possible code paths
2017-02-08 12:31:07 +01:00
Markus Goetz
df773ea8bb
CentOS: More build fixes
2017-02-08 11:39:28 +01:00
Markus Goetz
e7be4faac8
CentOS: Another attempt
2017-02-08 11:15:23 +01:00
Jenkins for ownCloud
a184c6bec1
[tx-robot] updated from transifex
2017-02-08 02:18:27 +01:00
Markus Goetz
1102ac20ac
Improve previous fix
...
After comment on 78a798eef3
2017-02-07 19:40:32 +01:00
Markus Goetz
6a4ae63f14
CentOS: Another fix for old compiler version (2)
2017-02-07 19:22:04 +01:00
Markus Goetz
6c6961e4d9
ChangeLog for 2.3 additions
2017-02-07 19:04:00 +01:00
Markus Goetz
78a798eef3
Old Qt: Another build fix
2017-02-07 18:54:40 +01:00
Markus Goetz
19dd656989
CentOS: Another fix for old compiler version
2017-02-07 18:32:34 +01:00
Markus Goetz
d9fac50e9b
CentOS: Fix build for old compiler version
2017-02-07 18:05:29 +01:00
Markus Goetz
9614a94035
Revert "Disable RTTI"
...
This reverts commit 85d3de1589#5470
2017-02-07 17:35:04 +01:00
Jenkins for ownCloud
5002964546
[tx-robot] updated from transifex
2017-02-07 02:18:27 +01:00
Jenkins for ownCloud
4cca1ba55f
[tx-robot] updated from transifex
2017-02-06 02:18:27 +01:00
Jenkins for ownCloud
3e99c32582
[tx-robot] updated from transifex
2017-02-05 02:18:27 +01:00
Jenkins for ownCloud
74ce597f8d
[tx-robot] updated from transifex
2017-02-04 02:18:27 +01:00
Jenkins for ownCloud
a27b2d94b3
[tx-robot] updated from transifex
2017-02-03 02:18:27 +01:00
Jenkins for ownCloud
890e771ec1
[tx-robot] updated from transifex
2017-02-02 02:18:27 +01:00
Jenkins for ownCloud
5df10cb8f8
[tx-robot] updated from transifex
2017-02-01 02:18:28 +01:00
Jenkins for ownCloud
9acc974268
[tx-robot] updated from transifex
2017-01-31 02:18:26 +01:00
Jenkins for ownCloud
42e64026ae
[tx-robot] updated from transifex
2017-01-30 02:18:28 +01:00
Jenkins for ownCloud
78e7d13f9f
[tx-robot] updated from transifex
2017-01-29 02:18:27 +01:00
Jenkins for ownCloud
2d55332a45
[tx-robot] updated from transifex
2017-01-28 02:18:34 +01:00
Jenkins for ownCloud
72cd9abd4a
[tx-robot] updated from transifex
2017-01-28 01:15:15 +01:00
Olivier Goffart
0d16cf41fe
Merge remote-tracking branch 'origin/master' into 2.3
...
We can do that because the only changes that were in master but not in 2.3 were the
translations change and documentation change, and the support for the 'M' permission
which we want in 2.3.
2017-01-27 17:45:05 +01:00
