Commit graph

11694 commits

Author SHA1 Message Date
Olivier Goffart
4581d708ff Account: remove dependency with ConfigFile
Part of #6213
2017-12-07 17:39:16 +01:00
Olivier Goffart
e0a14cac5b ConfigFile: use QStandardPaths::AppConfigLocation for the config file
Also use appName instead of appNameGui in order to compute the path

Issue: #2245

The reason is to respect the XDG spec on Unix (#1601) and might help
on windows roaming profiles (#684)
2017-12-07 17:39:16 +01:00
Olivier Goffart
ac844a2a45 AbstractNetworkJob: move the httpTimeout from the propagator to the network job
Remove one dependency from the config file for the sync engine.
Part of issue #6213
2017-12-07 17:39:16 +01:00
Olivier Goffart
7230fa6b4f SyncOptions: move to its own file
It does not really belong in the discoveryphase.h as it is used also for
propagator option.

Also use C++11 style member initializer
2017-12-07 17:35:38 +01:00
Olivier Goffart
e25af4f0dc csync_exclude: Fix compile
csync_exclude.cpp:428:17: error: assigning to 'char *' from incompatible type 'const char *'
        bname = path;
                ^~~~

The C library's strrchr always return 'char*'
Only the C++'s std::strrchr has two overloads
2017-12-07 17:34:14 +01:00
Christian Kamm
287670c9d6 Excludes: Remove fnmatch codepath
Now all exclude patterns can be translated to regular expressions.
2017-12-07 14:38:21 +01:00
Christian Kamm
994f3bb644 Excludes: fnmatch doesn't treat '{' as special
Neither the documentation at
http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_13
nor the fnmatch source code in <glibc>/posix/fnmatch_loop.c points
toward { causing special matching behavior.
2017-12-07 14:38:21 +01:00
Christian Kamm
e5c780ee19 Excludes: Translate full-path patterns to regex
Improves full matches by more than an order of magnitude
and also improves speed of traversal matches by roughly 20%,
judging by the check_csync_exclude performance test.
2017-12-07 14:38:21 +01:00
Christian Kamm
1c3d5ab158 Excludes: Introduce dir-only regex matches 2017-12-07 14:38:21 +01:00
Christian Kamm
5d668eca40 Excludes: Optimize Desktop.ini check 2017-12-07 14:38:21 +01:00
Christian Kamm
7ab127ad53 Excludes: Refactor for pending improvements
Make ExcludedFiles something that is instantiated outside of
the CSYNC context and then given to it as a hook.

ExcludedFiles still lives in csync_exclude and the internal
workings haven't been touched.
2017-12-07 14:38:21 +01:00
Olivier Goffart
dd91f4a86e Merge remote-tracking branch 'origin/2.4'
Conflicts:
	src/csync/csync.cpp
2017-12-07 09:37:50 +01:00
Olivier Goffart
3485109125 Jenkinsfile: Fix compilation
Add a CMAKE_PREFIX_PATH so it finds the right QtKeychain
2017-12-07 09:35:04 +01:00
Jenkins for ownCloud
a1136e7695 [tx-robot] updated from transifex 2017-12-07 02:18:34 +01:00
Hefee
32f38dc5f8 fix typo error: occured-> occurred 2017-12-06 20:02:53 +01:00
Christian Kamm
ceac18c554 Reconcile: Rename maps are consistent with update phase #6212
For duplicate file ids the update phase and reconcile phase determined
the rename mappings independently. If they disagreed (due to different
order of processing), complicated misbehavior would result.

This patch fixes it by letting reconcile try to use the mapping that the
update phase has computed first.
2017-12-06 16:42:11 +01:00
Christian Kamm
99f32dcb99 Clear csync rename mappings after reconcile
They were being preserved *across sync runs*.
2017-12-06 16:42:11 +01:00
Christian Kamm
79fe71db58 Hide selective sync buttons while disconnected #5809
The choices or big folder warnings will pop up again on reconnection.
2017-12-06 16:41:28 +01:00
Jenkins for ownCloud
ac937030f0 [tx-robot] updated from transifex 2017-12-06 02:18:35 +01:00
Olivier Goffart
ed5385faa3 Merge remote-tracking branch 'origin/2.4'
Conflicts:
	src/libsync/connectionvalidator.cpp
     	src/libsync/networkjobs.cpp
2017-12-05 15:58:13 +01:00
Markus Goetz
fe234499dd Update release_template.md 2017-12-05 09:22:23 +01:00
Jenkins for ownCloud
67d77dd6ce [tx-robot] updated from transifex 2017-12-05 02:18:35 +01:00
Markus Goetz
755ef0119a ChangeLog: More 2.4.0 changes up to now 2017-12-04 13:18:29 +01:00
Hefee
1a1ab92ed9 make doc-man working again. 2017-12-04 12:37:30 +01:00
Michael Stingl
b29e9b931d move man rst files to separate dir 2017-12-04 12:37:30 +01:00
Markus Goetz
0479322c1d fstack-protector: Improve previous commit 2017-12-04 12:37:03 +01:00
Klaas Freitag
0be7b6fe1f Only enable -fstack-protector-strong compiler flag for gcc > 4.9
On older/other compilers this flag is not understood.
2017-12-04 12:37:03 +01:00
Olivier Goffart
ee98daf9ea Shibboleth: Upgrade to OAuth2 When the server supports it
If the server support both Shibboleth and OAuth2, upgrades to OAuth2

Issue #6198
2017-12-04 08:09:34 +01:00
Jenkins for ownCloud
f2beaba3e9 [tx-robot] updated from transifex 2017-12-04 02:18:34 +01:00
Jenkins for ownCloud
823c7469e1 [tx-robot] updated from transifex 2017-12-03 02:18:34 +01:00
Jenkins for ownCloud
10efe1faee [tx-robot] updated from transifex 2017-12-02 02:18:34 +01:00
Olivier Goffart
e0954b0999 test/syncenginetestutils.h: Don't use toTimeZone only to get the UTC 2017-12-01 13:18:09 +01:00
Jenkins for ownCloud
5ff3e448f5 [tx-robot] updated from transifex 2017-12-01 02:18:34 +01:00
Jenkins for ownCloud
58bcbba841 [tx-robot] updated from transifex 2017-11-30 02:18:34 +01:00
Roeland Jago Douma
18b456ea2c
Merge pull request #77 from nextcloud/bump_drone
Bump drone images to contain WebEngine
2017-11-29 12:51:59 +01:00
Roeland Jago Douma
529442e0f8
Bump drone images
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-29 12:34:34 +01:00
Olivier Goffart
30e3932af8 FolderWizard: Fix minimum size
There are several bugs in QWizard that needs to be worked around for the minimum
size of the widget to take effect.

Issue #4280
2017-11-29 08:03:06 +01:00
Jenkins for ownCloud
e86937e2e2 [tx-robot] updated from transifex 2017-11-29 02:18:34 +01:00
Markus Goetz
6276d9290d utility_mac: Check for NULL from LSSharedFileListItemResolve #6123
Possibly also #6074
2017-11-28 13:35:15 +01:00
Markus Goetz
cde6589af8 owncloudcmd: Don't need Qt Sql module 2017-11-28 10:18:01 +01:00
Jenkins for ownCloud
482d538559 [tx-robot] updated from transifex 2017-11-28 02:18:53 +01:00
Roeland Jago Douma
8c411b32f7
Merge pull request #67 from edent/patch-3
Update ownCloud references to NextCloud
2017-11-27 20:40:01 +01:00
Roeland Jago Douma
ccd050455a
Merge pull request #62 from bceverly/master
Added build support for FreeBSD
2017-11-27 20:39:19 +01:00
Jenkins for ownCloud
6cc5ce7a66 [tx-robot] updated from transifex 2017-11-27 02:18:35 +01:00
Jenkins for ownCloud
7a80fe4939 [tx-robot] updated from transifex 2017-11-26 02:18:36 +01:00
Olivier Goffart
b8444053b8 AccountSettings: Fix the size of the "Add Sync Folder Connection" button
The problem here is that the QPainter is created on the viewport with is a
QWidget, but QAbstractItemView can have a different font, and the
QStyleOptionViewItem::font is this font. QStyleOptionViewItem::font
was used to compute the sizeHint, and the default font from the QPainter
was used to draw the text, so they could be not in sync.

Fix it by always using the font for QPushButton

Reported in
https://github.com/owncloud/client/issues/6156#issuecomment-346576328
2017-11-25 16:07:06 +01:00
Roeland Jago Douma
0ee0243595
Merge pull request #65 from edent/patch-2
Typo in documentation
2017-11-25 15:55:41 +01:00
Roeland Jago Douma
b6e986bb1b
Merge pull request #64 from edent/patch-1
Typo
2017-11-25 15:55:14 +01:00
Olivier Goffart
753d7addb4 libsync: Fix compilation with TOKEN_AUTH_ONLY
This means we cannot use QtGui in libsync.
So this mostly disable the avatar from the account and the avatarjob

Note that there is one logic change: in ConnectionValidator::slotUserFetched
we do the avatar job even if the user is empty. Otherwise we would end up in
a invalid state. This restore the 2.3.x behavior that was broken in
commit e05d6bfcdc
2017-11-25 12:57:16 +01:00
Terence Eden
632570a13b
Update ownCloud references to NextCloud
Fixes #66
2017-11-25 10:26:23 +00:00