Christian Kamm
29557ea550
Fix nautilus/nemo shell integration encoding issues #6393
...
The problem was that plain encode()/decode() in python2 use ascii
encoding, not utf8.
2018-03-21 11:25:37 +01:00
Jenkins for ownCloud
37a93dca63
[tx-robot] updated from transifex
2018-03-21 02:18:33 +01:00
Jenkins for ownCloud
b632b7e0fa
[tx-robot] updated from transifex
2018-03-20 02:18:30 +01:00
Jenkins for ownCloud
fc8e3b0914
[tx-robot] updated from transifex
2018-03-19 02:18:32 +01:00
Jenkins for ownCloud
861d777899
[tx-robot] updated from transifex
2018-03-18 02:18:31 +01:00
Jenkins for ownCloud
ff3e3ce886
[tx-robot] updated from transifex
2018-03-17 02:18:31 +01:00
Dominik Schmidt
d69e9ebf46
Apply branding to crashreporter resources file
2018-03-16 16:59:01 +01:00
Dominik Schmidt
24bf1b3629
Define APPLICATION_ICON_NAME fallback only in one place
2018-03-16 16:59:01 +01:00
Dominik Schmidt
94b0c9f78e
Fix crash reporter icon
2018-03-16 16:59:01 +01:00
Dominik Schmidt
567f7eb205
Apply branding to crashreporter resources file
2018-03-16 16:35:49 +01:00
Christian Kamm
a89508ba26
Minor header fixup
...
To make the IDE happy.
2018-03-16 13:41:57 +01:00
Jenkins for ownCloud
c3c8ab85ec
[tx-robot] updated from transifex
2018-03-16 02:18:30 +01:00
Olivier Goffart
0bf0f92949
OwnSql: Fixup after feedback for #6388
2018-03-15 19:30:21 +01:00
Olivier Goffart
04f8d0f2bc
OwnSql: Put the SQL queries next to their use.
...
This avoid haivng to modify 4 places when we want to add a query
2018-03-15 19:30:21 +01:00
Olivier Goffart
4584e5d3c5
OwnSql: Some refactoring
...
Use QByteArray for the query so we don't have to convert twice.
Automatically finish the query when the DB close, so we don't
have to call reset
2018-03-15 19:30:21 +01:00
Jenkins for ownCloud
d1c887d754
[tx-robot] updated from transifex
2018-03-15 02:18:32 +01:00
Olivier Goffart
bbf1843865
SyncEngine: remove the "CSync" wording from the error messages
...
They are confusing for the user.
Example in issue #6274
2018-03-14 10:25:45 +01:00
Olivier Goffart
b6aaa6fd2b
CSync: Remove unused error codes
...
None of the removed ERRNO code were ever set.
So none of the removed error hapenned anymore
2018-03-14 10:25:45 +01:00
Olivier Goffart
0031e09410
CSync: reconcile never returns an error
2018-03-14 10:25:45 +01:00
Olivier Goffart
0071011ebf
csync: remove CSYNC_PARAM_ERROR
...
It does not make sense to report such error to the user.
Its goal was to show invalid use of the csync API, but this is now done
with asserts.
2018-03-14 10:25:45 +01:00
Olivier Goffart
978a129eed
csync: Simplify csync_walk_local_tree/csync_walk_remote_tree
...
Small refactoring
2018-03-14 10:25:45 +01:00
Jenkins for ownCloud
991f4faafb
[tx-robot] updated from transifex
2018-03-14 02:18:31 +01:00
Jenkins for ownCloud
371acb296d
[tx-robot] updated from transifex
2018-03-13 02:18:36 +01:00
Christian Kamm
86b30e36c2
Merge remote-tracking branch 'origin/2.4'
2018-03-12 10:24:25 +01:00
Jürgen Weigert
7132e88f8e
removed germano0 as co-maintainer.
2018-03-11 12:53:39 +01:00
Jenkins for ownCloud
1119bcf539
[tx-robot] updated from transifex
2018-03-11 02:18:36 +01:00
Jenkins for ownCloud
d67018311f
[tx-robot] updated from transifex
2018-03-10 02:18:34 +01:00
Dominik Schmidt
50c8ec8fd9
Bump Qt to 5.10.1 and openssl to 1.1.0g on AppVeyor
2018-03-09 12:19:44 +01:00
Jenkins for ownCloud
eaecec418e
[tx-robot] updated from transifex
2018-03-09 02:18:35 +01:00
Michael Stingl
2e2ffca9e2
fixed 2.4.1 release date in ChangeLog
2018-03-08 16:16:40 +01:00
Jenkins for ownCloud
ab27bcacdf
[tx-robot] updated from transifex
2018-03-08 02:18:36 +01:00
Jenkins for ownCloud
536a051460
[tx-robot] updated from transifex
2018-03-07 02:18:36 +01:00
Christian Kamm
427bb83f0d
IssuesWidget: addItem performance improvement
...
Ensure adding a new item isn't usually O(n) by keeping track of which
items have associated issues.
2018-03-06 13:02:54 +01:00
Christian Kamm
faec059a9b
IssuesWidget: Don't allow two issues for the same file/folder
...
This is intended to safeguard against invalidation bugs that cause the
same error to be added again for every sync run.
2018-03-06 13:02:54 +01:00
Christian Kamm
641eddfbdf
INSTRUCTION_IGNORE now carries a direction
...
This allows IssuesWidget to selectively wipe only the 'Up' ignores
during selective local discovery.
2018-03-06 13:02:54 +01:00
Christian Kamm
61869bb65e
ProtocolItem: Adjust the way data is stored again
...
The struct makes it easy to pack data and should consume less memory
overall.
2018-03-06 13:02:54 +01:00
Christian Kamm
797473ba1f
SyncResult: Make sure the number of conflicts is correct #6226
...
If the SyncResult incorrectly believes that there are no conflicts, the
tray icon won't be correct and there will be no warning about unresolved
conflicts on the account.
Nevertheless, it's pretty awkward that the IssuesWidget is better
informed about pending conflicts than the Folder itself. This kind of
backwards data flow is very confusing.
Unfortunately the only alternative I see is to either keep track of
this information in two places (also in Folder), or create a common
data-holding class that can serve as a model instance for the issues
view as well as provide data directly to the Folder - which would
have been a much larger change.
2018-03-06 13:02:54 +01:00
Christian Kamm
f82d61ea19
SyncEngine: Make "local discovery?" question available
...
Also fix the minor bug that was mentioned and add tests.
2018-03-06 13:02:54 +01:00
Christian Kamm
ec281654ae
Issues tab: Invalidate issues selectively #6226
...
Everything is invalidated later: after discovery, not before. In
addition entries that should only be invalidated when new local
discovery is done have that behavior now.
2018-03-06 13:02:54 +01:00
Christian Kamm
52dfe589ba
ProgressInfo: Add information for local vs remote discovery
2018-03-06 13:02:54 +01:00
Christian Kamm
a5aebac6a7
slotFolderDiscovered: Fix 'local' always being false
...
It was unused, so no harm done.
2018-03-06 13:02:54 +01:00
Christian Kamm
13eb64584f
Discovery: Error if properties are missing #6317
2018-03-06 13:01:53 +01:00
Jenkins for ownCloud
259a117db5
[tx-robot] updated from transifex
2018-03-06 02:18:36 +01:00
Jürgen Weigert
2041f1ace8
Update release_template.md
2018-03-05 15:58:56 +01:00
Jürgen Weigert
08f402d264
Update release_template.md
2018-03-05 15:36:33 +01:00
Jürgen Weigert
d8084e2b18
Update release_template.md
2018-03-05 15:29:09 +01:00
Jürgen Weigert
7d03e47fea
Update release_template.md
2018-03-05 14:52:43 +01:00
Markus Goetz
f5f68c0bc0
ChangeLog: 2.4.1 had been released (..in branch)
2018-03-05 14:28:18 +01:00
Jenkins for ownCloud
167939a8c9
[tx-robot] updated from transifex
2018-03-05 02:18:37 +01:00
Jenkins for ownCloud
41ebfb635e
[tx-robot] updated from transifex
2018-03-04 02:18:36 +01:00
