chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-10-05 11:53:35 +02:00
Code Activity
14,674 Commits 4 Branches 173 Tags
v2.7.0-beta3
Commit Graph
14674 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Goetz 5f43c9cfad Merge tag 'v2.0.2-rc2' into 2.0 
Second RC of ownCloud Client 2.0.2
 2015-10-20 15:46:09 +02:00
Markus Goetz 98b966d274 OS X: Use Cocoa Pasteboard instead of QClipBoard #3300 2015-10-20 15:42:43 +02:00
Olivier Goffart 674b6f2373 Account Settings: clear the focus of the "Sign In" button when clicked 
So that the focus does not go to the "Remove Account" button instead
which would be wierd
 2015-10-20 13:56:35 +02:00
Olivier Goffart 407ff0a99d Theme: cache the QIcon::fromTheme 
We are calling that every time we draw the folder delegate.
Which is a lot when the sync is runing and the progress bar is moving
 2015-10-20 13:24:11 +02:00
Olivier Goffart 0b6d21e3d5 Logger: don't call qFormatLog when unessesary 
That's a lot of string operations that can be avoided if the log window
is not shown
 2015-10-20 13:22:48 +02:00
Markus Goetz 4c9bc42b69 Revert libqsqlite changes for now 
QtWebKit depends on it unfortunately
v2.0.2-rc2 		2015-10-20 13:04:33 +02:00
Olivier Goffart 557b704069 Fix compilation warning 
shibbolethcredentials.h:59:10: warning: 'askFromUser' overrides a member
function but is not marked 'override' [-Winconsistent-missing-override]
 2015-10-20 11:35:25 +02:00
Klaas Freitag d09de79491 Bump version to RC2 2015-10-20 11:30:00 +02:00
Olivier Goffart 4369e31a49 Folder Model: don't try to fetch data if the account is disconnected 
Now that it expands automatically, it would do lots of query to the
server when the account is disconnected. (all resulting in 401)
 2015-10-19 18:32:34 +02:00
Olivier Goffart 23b5a74c17 Account Settings: Don't expand while clicking on the '...' button 2015-10-19 18:23:56 +02:00
Olivier Goffart ee69ab2021 Account Settings: Don't disable double click expanding for sub folders 
The root folder open on simple click,  but the sub folder don't, so keep
this behaviour which is the native behaviour
 2015-10-19 18:12:49 +02:00
Olivier Goffart 374f29c4d3 Account Settings: Fix crash for acocunts withour folder 
Was broken by  027a865fbc
 2015-10-19 18:08:11 +02:00
Markus Goetz 67910e7d60 Discovery: Call it "Checking for changes in" in UI 
For #3431
 2015-10-19 15:59:16 +02:00
Markus Goetz c80b033466 VERSION.cmake: fixup 2015-10-19 15:57:13 +02:00
Olivier Goffart 671af9f8fe Merge branch 'master' 2015-10-19 15:53:58 +02:00
Olivier Goffart 6ea05ff6e3 Dolphin shell integration: use the owncloud icons 2015-10-19 15:53:40 +02:00
Markus Goetz 00485e133f VERSION.cmake: This is git not rc1 2015-10-19 15:51:33 +02:00
Olivier Goffart c520ee4eab Dolphin Shell Extension: renamove the kf5 in the name 2015-10-19 15:43:42 +02:00
Olivier Goffart 5408ec79f7 Dolphin shell extention: Remove the KDE4 based plugin 2015-10-19 15:42:41 +02:00
Olivier Goffart f8e68ae823 Merge branch 'dolphin-plugin' 2015-10-19 15:41:47 +02:00
Olivier Goffart 184412d88e Dolphin shell integration: Renames the plugins 
And put the helper in a shared library so it is shared accross both plugins
 2015-10-19 15:40:11 +02:00
Olivier Goffart 82d1d04774 Dolphin shell integration: share code between two plugins 2015-10-19 15:40:11 +02:00
Olivier Goffart 731d4b3d4d Dolphin shell extention: adapt to the change in KDE Frameworks 2015-10-19 15:39:51 +02:00
Markus Goetz ccec186b98 ETagJob: Depth 0 for server >= 8.1 #3730 2015-10-19 15:31:27 +02:00
Klaas Freitag c66c259447 SettingsDialog: Add new widet called ActivityWidget. 
This is the new widget to display server activity.
 2015-10-19 14:41:53 +02:00
Klaas Freitag 4ad165ce26 Utility: add method fileNameForGuiUse(), pimp up filename for GUI 
Currently, this one only replaces colons by / on Mac platform. This makes
the function resuseable.
 2015-10-19 14:36:55 +02:00
Markus Goetz 24a801dfd3 CMake/NSIS: We don't need QtSql (more) 2015-10-19 13:56:36 +02:00
Markus Goetz af79bc9211 CMake/NSIS: We don't need QtSql 
The NSIS change also had a redundant libsqlite3 DLL entry
 2015-10-19 13:46:46 +02:00
Klaas Freitag a3904f4d32 Theme: Revert logic of singleAccount switch. 
To use the same logic as the other clients and unify ownBrander
implementations, the switch is now called multiAccount() rather
than singleAccount() with a reverse logic.
Desktop Client stays with the default of having multiaacount
enabled.

Note that existing brandings need to rename the switch.

https://github.com/owncloud/ownbrander/issues/443
 2015-10-19 12:26:42 +02:00
Olivier Goffart 5cac90b3eb SelectiveSyncTreeView: show the size for the root item (#3755) 2015-10-19 10:58:54 +02:00
Olivier Goffart df135a0bb2 Merge branch '2.0' 
Conflicts:
	src/gui/folder.cpp
 2015-10-19 10:57:37 +02:00
Olivier Goffart b7c927f349 csync: Fix warning the bit field need to be unsigned 2015-10-19 10:13:11 +02:00
Jenkins for ownCloud 64718fe567 [tx-robot] updated from transifex 2015-10-19 01:15:39 -04:00
Jenkins for ownCloud 79f14e0933 [tx-robot] updated from transifex 2015-10-18 01:15:40 -04:00
Jenkins for ownCloud 3ad8c692a4 [tx-robot] updated from transifex 2015-10-17 02:19:01 -04:00
Klaas Freitag 546cab3f62 Config: Use monochrome icons per default on MacOSX. 2015-10-16 18:55:07 +02:00
Roeland Jago Douma 4a04dc1a3e Typos 2015-10-16 12:51:24 +02:00
Roeland Jago Douma 0e97fbb730 Use overloaded functions 2015-10-16 12:48:48 +02:00
Olivier Goffart 83edb7fb8a csync: fix compilation error with -pedentic 2015-10-16 11:45:36 +02:00
Olivier Goffart 0c59c85127 SyncEngine: Folders with ignored files should not count when counting none files 
If there is a any none files, we do not show the dialog saying that all
files have been removed. If a directory contiains ignored files, we still
want to show this message box even if the directory will not be deleted
 2015-10-16 11:43:52 +02:00
Klaas Freitag d6098c39dc Update Changelog and bump version to 2.0.2rc1 v2.0.2-rc1 2015-10-16 11:12:50 +02:00
Klaas Freitag af721118cd Merge branch '2.0' of github.com:owncloud/mirall into 2.0 2015-10-16 10:08:27 +02:00
Markus Goetz 0d5f2b5d31 Propagator: Reset upload blacklist if a chunk suceeds 
For #3934
 2015-10-16 10:06:45 +02:00
Klaas Freitag 1790a128aa Merge tag 'v2.0.1' into 2.0 
Version 2.0.1
 2015-10-16 10:06:38 +02:00
Olivier Goffart 87fa1794a1 Updater: remove unused function 
It was even throwing a warning because it is an infinite recursion
 2015-10-16 09:56:26 +02:00
Olivier Goffart 4df828d0b0 csync_file_stat_s: Save a bit of memory 2015-10-16 09:56:26 +02:00
Hugo Gonzalez Labrador 4d1d6dff3b Increased fileID size to 36 bytes 
This is the size used by UUIDs
 2015-10-16 09:27:19 +02:00
Olivier Goffart 81e30cd8d2 Merge pull request #3695 from owncloud/nomkpath3692 
Folder: Do not create the sync folder if it does not exist #3692
 2015-10-16 09:21:15 +02:00
Markus Goetz 983671c8cb Shibboleth: Add our base user agent to WebKit 
For #3913
 2015-10-16 09:15:47 +02:00
Roeland Jago Douma 40ab3ee751 Now only 1 constructor to ocssharejob 
* Pass the share_id to the functions that need it
 2015-10-16 08:28:13 +02:00