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
12,647 Commits 4 Branches 173 Tags
techpreview-v2
Commit Graph
12647 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jenkins for ownCloud eb6b254dc5 [tx-robot] updated from transifex 2015-10-16 02:19:02 -04:00
Roeland Jago Douma f95fea9866 Move permissions to OcsShareJob 2015-10-16 08:09:57 +02:00
Roeland Jago Douma 03719334ea Remove unused members 2015-10-15 22:27:55 +02:00
Roeland Jago Douma 4441053b1c Thumbnailjob fixes 
* Comments
* Use the path of the abstractnetworkjob
 2015-10-15 22:18:22 +02:00
Roeland Jago Douma a34b663828 Now add parameters in a less crappy way 2015-10-15 21:58:16 +02:00
Roeland Jago Douma db1f4d4016 OCSJob -> OcsJob and more docs 2015-10-15 20:54:52 +02:00
Roeland Jago Douma 3ea944d1b3 Added setPublicUpload to OcsShareJob 2015-10-15 20:34:56 +02:00
Roeland Jago Douma b293aa762c Split sharing code 
There is now a generic OCSJob which must be inherited by other jobs. This is in
prepartion for the other OCS job that will come (for the Sharee API endpoint
for example).

More logic is moved from the sharedialog to the OcsShareJob. So in the GUI code
we now only say what we want (a new share, set the password etc). And the code
in libsync will make that happen. Error handling is for now still done in the
GUI part.

For now the ocsjob and ocssharejob live in gui but probabaly we should
create a libshare or libocs at some point.
 2015-10-15 20:05:47 +02:00
Markus Goetz b5e75afc17 General settings: Align checkbox #3758 2015-10-15 19:15:50 +02:00
Markus Goetz 027a865fbc Account Settings: Show selective sync buttons after list load 
Especially nice when having a slower network.
For #3839
 2015-10-15 18:52:16 +02:00
Markus Goetz 132b5f5130 Account Settings: Expand selective sync on show #3585 2015-10-15 17:27:38 +02:00
Markus Goetz c3754e1fdd folderstatusmodel.h: Fix warning 2015-10-15 17:27:29 +02:00
Markus Goetz 963eb1f29b VERSION.cmake: master is 2.1 2015-10-15 16:51:29 +02:00
Christian Kamm c418d67920 Merge remote-tracking branch 'origin/2.0' 2015-10-15 15:54:09 +02:00
Christian Kamm 6e09e3af86 Fix test compile 
I regularly fix errors in the copies of the test sources that are
made in build/. Refactoring how these tests work could be worthwhile.
 2015-10-15 15:52:58 +02:00
Christian Kamm 67e9a06d30 Progress estimation: Adjust low-transfer detection #3942 
Progress estimation is usually based on transfer speed. That makes no
sense when we're doing operations like deletes, that need very little
data transfer but nevertheless take a long time.

This hack attempts to detect this case better and switches to a
different estimate.

We should rewrite this to maintain and update estimates for the
transfer speed, per-file overhead and chunk-assembly overhead each
time an item finishes. Then we could provide more consistent progress
estimates without ad-hoc fixes like this one.

Also, there's an issue where resuming a partial download will lead
to exaggerated transfer speed estimates.
 2015-10-15 15:04:11 +02:00
Christian Kamm abd63035c1 ETag: Allow parsing of weak tags #3946 2015-10-15 14:57:34 +02:00
Markus Goetz 745cf55abb SelectiveSync: Increase folder list timeout to 60 
Already done for 2.1 in 05eee16959
For #3524
 2015-10-15 14:43:11 +02:00
Olivier Goffart e1c634d000 Don't show the settings if another instance is started less than 10 secs after the apps. 
Issue #3273

isSessionRestored was not set correctlty so ignore it
 2015-10-15 14:25:23 +02:00
Jenkins for ownCloud 49a3a3ba7b [tx-robot] updated from transifex 2015-10-15 02:19:02 -04:00
Carla Schroder 9982211ced Merge pull request #3950 from owncloud/revert-3931-phil-davis-3dot-menu-doc-20 
Revert "Update "..." menu documentation for 2.0"
 2015-10-14 09:04:06 -07:00
Carla Schroder 10f59bf3ad Revert "Update "..." menu documentation for 2.0" 2015-10-14 09:03:08 -07:00
Roeland Douma df2418d9c5 Merge pull request #3661 from rullzer/public_upload 
Allow setting of public upload on link shares
 2015-10-14 15:34:25 +02:00
Roeland Jago Douma 2fdae6d72f Allow setting op public upload on link shares 2015-10-14 15:30:28 +02:00
Roeland Jago Douma 05471d0acd Also parse capabilitie for public uploads 2015-10-14 15:30:23 +02:00
Christian Kamm 05eee16959 SelectiveSync: Show in-progress label #3524 
We now show 'Fetching data...' after a second.

This also increased the timeout to 60s, making the error
condition much less likely.
 2015-10-14 13:05:53 +02:00
Roeland Douma a752eadd0f Merge pull request #3923 from owncloud/check_shareapi_available 
Provide information about share availablity for files
 2015-10-14 12:38:03 +02:00