mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,723 Commits 194 Branches 287 Tags 562 MiB
0b3129f366
Commit Graph

5434 Commits

Author SHA1 Message Date
Julius Härtl
bcb9553925
Use Qt5DBus_FOUND instead of the old WITH_DBUS 
WITH_DBUS was removed in 257d8142b1

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-25 14:18:03 +01:00
Roeland Jago Douma
48bce4c6b0
Merge remote-tracking branch 'oc/master' into oc_up 2018-01-25 11:17:04 +01:00
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
Olivier Goffart
02988229b1 FolderStatusModel: don't use deprecated QModelIndex::child 
Was deprecated in Qt 5.8.
(IMHO this show that child can be usefull and I am not sure the
deprecation was justified)
 2018-01-24 10:23:03 +01:00
Olivier Goffart
72b9beb79c Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	shell_integration/nautilus/syncstate.py
 2018-01-23 14:08:15 +01:00
Olivier Goffart
982c591ec9 SocketApi: add a way to disable menu entries 2018-01-23 14:02:56 +01:00
Olivier Goffart
1782ae3c08 SocketAPI: Make it easier to add or remove item in the action menu 
By making it dynamic.
So far only the dolphin shell extension have been ported
 2018-01-23 14:02:56 +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
Christian Kamm
59f2e0634e Protocol: Correct sorting by size #6326 
Previously we were sorting by size string, where
"6 MB" < "3 KB".
 2018-01-23 12:02:16 +01:00
Christian Kamm
32bb1e6763 ProtocolItem: Use accessors over magic numbers 2018-01-23 12:02:16 +01:00
Christian Kamm
497b327d43 ShareLinkWidget: Remove outdated signal connection 
Also convert the others to the new syntax to avoid similar errors in the
future.
 2018-01-23 12:01:22 +01:00
Christian Kamm
d831369f86 Protocol: Remove entries for auto resolved conflicts #6316 2018-01-23 12:01:22 +01:00
Olivier Goffart
c3dbb20ce3 Logger: --logdebug only show owncloud's debug message 
Recent Qt version show way too many debug messages, spamming the console.
So filter only messages that comes from the client.
 2018-01-22 21:13:15 +01:00
Olivier Goffart
5a97ddde5a Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/gui/updater/updater.cpp
 2018-01-19 13:41:29 +01:00
Olivier Goffart
b8539eb329 Get rid of the StopWatch in the PropagateUpload job 
For issue #6318

The StopWatch is using memory, and we are not really using it.
 2018-01-19 13:37:48 +01:00
Christian Kamm
b9c7aa8df3 Sync: Deal with file/folder conflicts #6312 
Previously conflicts with a different type on both ends lead to sync
errors. Now they are handled in the expected way: the local item gets
renamed and the remote item gets propagated downwards.

This also adds a unittest for the TYPE_CHANGE case. That one looks like
parts of it might be unified with CONFLICT cases.
 2018-01-19 09:47:49 +01:00
Christian Kamm
c1b5412c16 Exclude regex: Use named captures 
My benchmarks show no performance difference.
 2018-01-18 10:24:24 +01:00
Christian Kamm
4337e8532e Exclude matching: Speedup the full-path traversal case 
Previously we'd use the full regex when the bname triggered a full-path
matching to take place. Now we have a simplified full-traversal regex
for this case that can be significantly faster to apply.

Triggered by #5017 but doesn't actually solve it.
 2018-01-17 15:05:50 +01:00
Christian Kamm
a8a6f82270 Link shares: Change default share name #6298 
There's a 64 character limit and we don't want to accidentally exceed
it.

Eventually there might be server API for default share name generation.

See owncloud/core#29913
 2018-01-17 15:03:11 +01:00
Dominik Schmidt
fe3c68b9dd Fix Linux icons 2018-01-17 12:18:31 +01:00
Olivier Goffart
2a14ba5582 Folder: remove declaration of non-existing method 2018-01-15 15:43:13 +01:00
Olivier Goffart
2a842a5745 Application: remove declaration of non-existing functions 2018-01-15 15:07:09 +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
Jürgen Weigert
a33fc2a0db Update updater.cpp 
deprecate suffix nightly, promote suffix daily
 2018-01-15 11:25:10 +01:00
Dominik Schmidt
7839c4d4e1 Revert "Disable stack protection for mingw win32 builds in 2.4" 
This reverts commit 298f1ab570.

We're shipping libssp-0.dll now with mingw builds. We would
have enough time to test this for 2.5.0 now anyway, but we
also will most likely switch to MSVC for that release.
 2018-01-14 14:39:29 +01:00
Dominik Schmidt
d8a279c671 Fix windows cross build of the updater and bump libcrashreporter-qt revision 2018-01-14 00:45:02 +01:00
Dominik Schmidt
6d56f30d9b Fix incorrect target_include_directories usage for crash reporter 2018-01-13 23:49:58 +01:00
Dominik Schmidt
81c20352e1 Use new ECMAddAppIcon macro for application icons. 
cmake/modules/ECMAddAppIcon.cmake is heavily patched to support sidebar icons, OUTFILE_BASE parameter and to not include 64 and 64@2x icons on macOS which are not supported. All changes are made in a way that we can upstream this.
 2018-01-13 13:58:17 +01:00
Dominik Schmidt
6ee87a77cc Fix macOS updater build without deprecated Qt apis 2018-01-13 13:58:17 +01:00
Dominik Schmidt
539d6fd92e Link client against QtMacExtras as it bundles qtmacgoodies 2018-01-13 13:58:17 +01:00
Dominik Schmidt
cbf470f17b Fix csync installation on windows 2018-01-13 13:58:17 +01:00
Olivier Goffart
437d45981e Remove unused c_strlist 2018-01-13 13:58:17 +01:00
Olivier Goffart
3ae327ea8e Modernize out CMakeLists.txt 
Mainly uses target_include_directories instead of include_directories
so libraries public include directory get automatically added when adding
the target in target_link_library
 2018-01-13 13:58:17 +01:00
Olivier Goffart
5d0aa5f039 Remove unused c_path 2018-01-13 13:58:17 +01:00
Olivier Goffart
41798cef18 Csync: remove some unused build system stuff 2018-01-13 13:58:17 +01:00
Olivier Goffart
1c11778693 Remove the unusued csync_file_locked_or_open test in csync_reconcile 
It is unused. Also remove the corresponding error code
 2018-01-13 13:58:17 +01:00
Olivier Goffart
3ddd4b6f16 Get rid of csync_log 
We use Qt's debugging code everywhere
 2018-01-13 13:58:17 +01:00
Olivier Goffart
d948ed11a1 Csync: use QElapsedTimer and qCInfo instead of CSYNC_LOG and its own csync time function 
This allow to remove all the csync time manipulation routne which are now unused
 2018-01-13 13:58:17 +01:00
Olivier Goffart
257d8142b1 Build system: Get rid of QtVersionAbstraction.cmake 
Use modern cmake with target_link_libraries and Qt5:: that
automatically add the include path and compile flags
 2018-01-13 13:58:17 +01:00
Olivier Goffart
48c55b7d29 csync/std: don't build in a separate library 
There is no need to create a static library for the csync/std file, just
put everything together in csync
 2018-01-13 13:58:17 +01:00
Olivier Goffart
776bbbf7b1 Don't include sqlite3.h from headers 
So that sqlite is not part of the public interface of csync
(and that the sqlite include path don't need to be passed when compiling
libsync or gui)
 2018-01-13 13:58:17 +01:00
Dominik Schmidt
dbf15fb8dc Make setLaunchOnStartup debug output more meaningful 2018-01-11 16:11:23 +01:00
Olivier Goffart
9613f6437d Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libsync/networkjobs.cpp
 2018-01-11 10:46:50 +01:00
Jürgen Weigert
9dc765142c
Update updater.cpp 
depricate suffix nightly, promote suffix daily
 2018-01-10 16:19:08 +01:00
Christian Kamm
7d70f1becb Ignore files that can't be encoded for the filesystem 
There's an upstream bug where QTextCodec::canEncode returns true even
though it should be false. This works around that issue and adds a test.

The original work was done in 72809ef5b1

See #6287, #5676, #5719
See https://bugreports.qt.io/browse/QTBUG-6925
 2018-01-10 13:36:00 +01:00
Christian Kamm
cdd8d10940 Fix resizing crash when currentPage() is null 
Sentry:
https://sentry.io/owncloud/desktop-win-and-mac/issues/425331770/
 2018-01-09 13:54:11 +01:00
Christian Kamm
883deb1c5d Fix potential crash in Composite job destruction 
Sentry:
https://sentry.io/owncloud/desktop-win-and-mac/issues/427476987/
 2018-01-09 13:53:57 +01:00
Christian Kamm
e389fcaecb Avatars: Use old location for servers <10 #6279 2018-01-09 11:34:56 +01:00
Christian Kamm
585d2b20bd Exclude regex: Restore old matching on Windows #6245 
Unfortunately matching behaved differently on Windows. This patch
restores the previous matching behavior but still uses the new regular
expression based matching.

Further work will hopefully unify the behavior between platforms without
breaking backwards compatibility.
 2018-01-09 11:09:05 +01:00