mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-21 05:13:04 +03:00
Code Issues Projects Releases Packages Wiki Activity
11541 commits 486 branches 258 tags 463 MiB
Commit graph

5366 commits

Author SHA1 Message Date
Roeland Jago Douma
84b26e0d4d
Merge pull request #133 from nextcloud/fix-notification-dismiss-button 
Uses QString::number to get a string equivalent of the notification_id number
 2018-01-24 19:29:21 +01:00
Camila San
7a69e19e4d
Uses QString::number to get a string equivalent of the notification_id number. 
This fixes the bug reported #117.

Signed-off-by: Camila San <hello@camila.codes>
 2018-01-24 17:29:45 +01:00
Roeland Jago Douma
7ce009ef49
If status.php fails check <server>/nextcloud/status.php 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-23 13:43:44 +01:00
Camila Ayres
cd36f73f6b
Removes 'Log in to all accounts' and 'Log out to all accounts' from main menu. 
This is not an often used option and it should be fine if this can only be done
from within the settings dialog.

Signed-off-by: Camila San <hello@camila.codes>
 2018-01-15 11:48:27 +01:00
Julius Härtl
49a16ffb4b
Fix build on windows 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-12-15 10:59:14 +01:00
Julius Härtl
1cedb1919f
Integrate libcloudproviders support 
This commit integrates support for libcloudproviders
desktop integration API. If build with the library it
will check on startup if the DBus interface is available
and then use it instead of the legacy status icon.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-12-14 11:19:25 +01:00
Roeland Jago Douma
fe4bb52a6d
Merge remote-tracking branch 'oc/master' into oc_up 2017-12-14 10:27:11 +01:00
Christian Kamm
f40cceaf04 Share link: Adjust design of folder sharing permissions #6192 2017-12-14 08:34:44 +01:00
rockihack
8a963a67f2 stack-protector is not supported on hppa. 2017-12-13 11:27:48 +01:00
rockihack
586fd346ea Enable stack-protector-strong on Windows and macOS. 2017-12-13 11:27:48 +01:00
Christian Kamm
e5ed8fc90a Merge remote-tracking branch 'origin/2.4' 2017-12-13 11:03:24 +01:00
Markus Goetz
75676f8830 Notifications: Propagate "Dismiss" as DELETE to server #5922 
(cherry picked from commit e86416fff7)
 2017-12-13 11:00:40 +01:00
Olivier Goffart
02283fc686
Merge pull request #6224 from owncloud/deprecated 
Remove use of deprecated Qt API
 2017-12-12 11:48:04 +01:00
Christian Kamm
dcf0baa9de Journal: 64bit inodes, fix storing uint64s generally 
In addition to using the right function when retrieving inodes this
*also* fixes a more general bug ownsql had with storing uint64 values
that didn't fit into an int64.
 2017-12-12 10:30:54 +01:00
Olivier Goffart
bae00358b9
Merge pull request #6219 from owncloud/config 
Move config and remove most dependencies form the sync engine.
 2017-12-11 17:10:18 +01:00
Olivier Goffart
d517d92f6c FolderWizard: don't use deprecated API 2017-12-08 16:16:06 +01:00
Olivier Goffart
71dcf7fc37 SSLButton: Removes some call to deprecated functions 2017-12-08 16:16:02 +01:00
Olivier Goffart
0a59faf03d OcsJob: Use QUrlQuery 
Qurl::setEncodedQueryItems is deprecated.
 2017-12-08 16:15:48 +01:00
Olivier Goffart
7bd48b1327 cmd: remove usage of deprecated qInstallMsgHandler 2017-12-08 16:15:48 +01:00
Olivier Goffart
8c652e061d Remove uses of deprecated QString::fromAscii 2017-12-08 16:15:48 +01:00
Olivier Goffart
a4816d6a8c Updater: use QUrlQuery 
QUrl::addQueryItem is deprecated
 2017-12-08 16:15:47 +01:00
Olivier Goffart
1a503d54f6 Remove usage of deprecated qSort 2017-12-08 16:15:47 +01:00
Olivier Goffart
263668b1cb Remove use of deprecated translate call 2017-12-08 16:15:38 +01:00
Olivier Goffart
3df65460f5 Remove usage of QString::null 
Replaces by "QString()"
 2017-12-08 16:15:22 +01:00
Olivier Goffart
74672d493d Utility: use QUrlQuery 
For QUrl::setQuery is deprecated in Qt5
 2017-12-08 16:15:17 +01:00
Olivier Goffart
f1b7d506ae csync_exclude: fix compilation of non-test builds 2017-12-08 09:43:26 +01:00
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
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
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
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
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
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
Roeland Jago Douma
ccd050455a
Merge pull request #62 from bceverly/master 
Added build support for FreeBSD
 2017-11-27 20:39:19 +01:00