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
Olivier Goffart
65e4afedc4
Account Wizard: don't whitelist everything on the first sync if we still want to confirm big folder
...
Issue: https://github.com/owncloud/client/pull/5340#issuecomment-274564441
2017-01-27 15:59:59 +01:00
Olivier Goffart
b76a9654cc
General Settings: Make sure to reload the settings when an account is added
...
The Size limit, or confirmation checkboxes might have changed.
We need to guard against saving if the control changes while we are loading
Issue: https://github.com/owncloud/client/pull/5340#issuecomment-274878023
2017-01-27 15:59:59 +01:00
Olivier Goffart
38cf459b3e
Confirm External Storage: adjust the notification message
...
We need to forward the information that the folder is an external storage
for the notification message.
Issue: https://github.com/owncloud/client/pull/5340#issuecomment-274878023
2017-01-27 15:59:59 +01:00
Olivier Goffart
ed7416098e
Wizard: Increase the size
...
The advanced page has become quite complex and does not fit on the screen
anymore if the fonts are too big
2017-01-27 15:59:59 +01:00
Olivier Goffart
517623e457
FolderStatusModel: Different icon for external storages
...
Issue: https://github.com/owncloud/client/pull/5340#issuecomment-274564441
2017-01-27 15:59:59 +01:00
Olivier Goffart
f89bc09fd1
Discovery: Filter 'M' out of permissions for non root storage
...
The sync engine rely on the 'M' in premission to ask for confirmation
(As requested in issue #5340 )
But we only want to ask the premission for the 'root' of the mounting point and not
for every subfolders within it.
So we change the discovery phase in a way that it does not keep the 'M' for
children within the external storage.
2017-01-27 15:59:59 +01:00
Olivier Goffart
f854c5263b
Wizard: Add options to ask confirmation for external storage
...
Added two checkboxes in the Account Wizard in the advanced page to change the first options.
Also added a checkbox in the general settings to ask for confirmation for external storages.
Theme options allow to hide the checkboxes in the wizard.
As described in issue #5340
2017-01-27 15:59:59 +01:00
Olivier Goffart
70da607e06
Discovery: Add branding option to disable default sync of 'M' directories
...
Issue #5331 and https://github.com/owncloud/enterprise/issues/1594
2017-01-27 15:59:59 +01:00
Jenkins for ownCloud
4f28b2daad
[tx-robot] updated from transifex
2017-01-27 02:18:28 +01:00
Jocelyn Turcotte
8884fe7236
Remove PropagateDirectory::_runningNow
...
This variable isn't used anymore except in a stray Q_ASSERT.
2017-01-26 17:13:54 +01:00
Jocelyn Turcotte
bb3efc5988
Clear SyncEngine::_remotePerms after the sync
...
Also make reuse the SyncFileItem::_remotePerm QByteArray allocation
instead of redoing the copy from the csync char*.
2017-01-26 17:13:54 +01:00
Jocelyn Turcotte
f6665ccc81
Pack boolean members in PropagateUploadFileCommon #5457
2017-01-26 17:13:54 +01:00
Jocelyn Turcotte
f1e9be4fa8
Don't use the StopWatch for each job in production builds #5456
...
This accounted for more than 10% of the peak memory usage while only
providing value through the debugging log.
2017-01-26 17:13:54 +01:00
