Christian Kamm
2641a6af21
Rename local discovery option for clarity
...
It's using full relative filepaths, not just dir paths.
2018-03-28 11:25:32 +02:00
Olivier Goffart
d69936e065
FolderStatusModel: fix potential assert
...
OCC::FolderStatusModel::slotUpdateDirectories: ASSERT: "parentInfo->_fetching" in file /home/olivier/kdegit/owncloud/mirall/src/gui/folderstatusmodel.cpp, line 599
This can happen if the structure of a folder is change while the user
expands the root folder. In this case, resetSubs() is called which
resets _fetching to false.
Instead, we need to keep a pointer to the job so we can abort it by
deleting it.
2018-03-28 10:19:05 +02:00
Christian Kamm
1ac45be94e
Readme: Update list of maintainers
2018-03-28 10:11:40 +02:00
Christian Kamm
3d002468ae
Readme: Fix link to binary downloads
2018-03-28 10:11:40 +02:00
Christian Kamm
5e75d224ee
Blacklisting must prevent parent etag updates #6411
2018-03-28 10:01:33 +02:00
Jenkins for ownCloud
8e7f7cfec8
[tx-robot] updated from transifex
2018-03-28 02:18:35 +02:00
Markus Goetz
31f13c8846
SslButton: Improve speed (especially on macOS) #6031
...
From 1+n*450msec to 1*450msec
2018-03-27 17:43:57 +02:00
Christian Kamm
25deaed9e5
Excludes: Expand doc, Desktop.ini only in root folder
...
The Desktop.ini exclude was added for 2.4 because we add such a file to
the synced folder on Windows. It doesn't need to cover subdirectories.
2018-03-27 12:43:53 +02:00
Christian Kamm
17342031d7
Upload: Simplify 'finished' flag
...
* Sometimes there was 'finished' and '_finished'
* Make each done() call automatically set _finished to true
2018-03-27 12:42:48 +02:00
Olivier Goffart
26b991c0c0
Folder: normalize the local path.
...
We otherwise normalize all path in the C form, so we must have
the Folder's path normalized the same. Or all comparizon will fail
(such as knowing if a file from the SocketAPI or the FilesystemWatcher
are part of the folder)
Issue #4424
2018-03-27 10:54:10 +02:00
Olivier Goffart
3f4d504c34
propagateuploadv1: don't finalize after a done()
...
Should fix an assert when "Server does not support X-OC-MTime"
(Which only happens with owncloud 5)
Issue #6403
2018-03-27 10:50:40 +02:00
Olivier Goffart
6a4486df3b
Merge pull request #6402 from whitequark/patch-1
...
Dolphin plugin: fall back if $XDG_RUNTIME_DIR is empty
2018-03-27 10:32:12 +02:00
Jenkins for ownCloud
9516519165
[tx-robot] updated from transifex
2018-03-27 02:18:34 +02:00
Markus Goetz
7739157bfc
SslButton: Add HTTP/2 info #3146
2018-03-26 22:49:54 +02:00
Markus Goetz
b34878c16d
macOS: Put Qt version in .pkg name
2018-03-26 19:21:27 +02:00
Jenkins for ownCloud
962c38583f
[tx-robot] updated from transifex
2018-03-26 02:18:32 +02:00
whitequark
9bd30cf003
Dolphin plugin: fall back if $XDG_RUNTIME_DIR is empty
...
As per XDG Base Directories specification:
> If $XDG_RUNTIME_DIR is not set applications should fall back
> to a replacement directory [...]
In practice, the ownCloud client has the fallback, but the plugin
helper does not, and if $XDG_RUNTIME_DIR is not set, the plugin
mysteriously does not work.
2018-03-24 08:12:25 +00:00
Jenkins for ownCloud
20881cd004
[tx-robot] updated from transifex
2018-03-24 02:18:32 +01:00
Jenkins for ownCloud
e5b93c7584
[tx-robot] updated from transifex
2018-03-23 02:18:33 +01:00
Markus Goetz
24e2c809e4
macOS: Fix .app icon
2018-03-22 16:30:22 +01:00
Markus Goetz
75a269acb6
About section: Try to lower height #6075 #6215
2018-03-22 15:37:04 +01:00
Jenkins for ownCloud
8357f1ea9a
[tx-robot] updated from transifex
2018-03-22 02:18:32 +01:00
Markus Goetz
20bd943a87
macdeployqt: Qt 5.10.1 #5932
2018-03-21 19:20:50 +01:00
Olivier Goffart
424898603a
mirall.desktop.in: Remove all the Translations comments
...
Relates to #5767
2018-03-21 15:03:45 +01:00
Jenkins for ownCloud
c1592e34c7
[tx-robot] updated from transifex
2018-03-21 11:56:01 +01:00
Christian Kamm
edacaae15f
Merge remote-tracking branch 'origin/2.4'
2018-03-21 11:47:29 +01:00
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
