chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-11-27 06:42:46 +01:00
Code
9,091 Commits 4 Branches 173 Tags 91 MiB
v2.1.0
Commit Graph

9091 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Molkentin
c7bf09c3d4 Merge remote-tracking branch 'origin/2.0' 2015-10-21 18:49:58 +02:00
Daniel Molkentin
c8ae54d9e8 Merge pull request #3982 from owncloud/20-update 
update 3-dot menu
 2015-10-21 18:49:38 +02:00
Carla Schroder
daf6d8772f update 3-dot menu 2015-10-21 09:44:38 -07:00
Olivier Goffart
c80e72da83 Sharing: change coding style of enum 
From all upper case to camel case

This hopefully fix the Windows build which fails because DELETE seems
to be a macro
 2015-10-21 18:40:04 +02:00
Roeland Douma
ec351e00ad Merge pull request #3773 from owncloud/split_sharedialog 
Split sharedialog code
 2015-10-21 16:55:59 +02:00
Olivier Goffart
cf242871ea SyncEngine: keep a static pointer to the codec 
The QTextCodec for UTF-8 is not going to change during the application life time.
So no need to look it up for every file
 2015-10-21 16:38:26 +02:00
Olivier Goffart
597d36dcf2 csync_statedb: Use the index in csync_statedb_get_below_path 
Make an index from the path, and make a query that uses the index
 2015-10-21 16:38:26 +02:00
Olivier Goffart
9c388787bb csync_update: Don't fetch the etag in the local discovery from the DB 
We don't need it, and it's slow.
This saves a lot of DB queries

(Also replaced a strlen>0 with a faster check)
 2015-10-21 16:38:26 +02:00
Markus Goetz
f739d8fdd3 sqlite: Update to version 3.9.1 
For OS X and Windows.
This is in line with the tests/benchmarks Olivier is doing on ArchLinux.
 2015-10-21 15:55:41 +02:00
Daniel Molkentin
78d782601e 2.0.2 final 2015-10-21 09:54:02 +02:00
Daniel Molkentin
86a83dc32c Finalize ChangeLog, adjust formatting 2015-10-21 09:53:34 +02:00
Daniel Molkentin
c67e53c7b2 set version suffix back to git 2015-10-21 09:48:18 +02:00
Jenkins for ownCloud
5659e04e89 [tx-robot] updated from transifex 2015-10-21 02:19:02 -04:00
Olivier Goffart
8ff3055b47 sync-exclude.lst: Remove entries that are hardcoded anyway 
The more item in the sync-exclude.lst, the slower is the sync.
Many items are already hardcoded. Some are files that no longer
exist.
 2015-10-20 18:38:47 +02:00
Olivier Goffart
71827549d6 csync_exclude: Use PathMatchSpecA instead of PathMatchSpecW 
So we avoid lots of memory allocation.
We can work with char* directly since both the pattern and the file
name are in UTF-8 and there is no need to understand unicode for
such pattern.

(In fact, '?' would not match anyore non-ascii characters, but I
don't think that's a problem. I don't think anyone use '?' in its
exclude list. And the two allocations per call to csync_fnmatch are
really worth getting rid of)
 2015-10-20 18:38:47 +02:00
Olivier Goffart
de5de7acc5 csync_exclude: Optimize 
Avoid alocations as much as possible
 2015-10-20 18:38:47 +02:00
Markus Goetz
c8590c4468 Remove legacy propagator and neon 
The code was already uneeded/unbuilt on Windows and OS X.
 2015-10-20 17:57:43 +02:00
Markus Goetz
5f43c9cfad Second RC of ownCloud Client 2.0.2 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABAgAGBQJWJi7YAAoJEEmMRevpTns3ytcQAKZtrJUr8ZCCKGHka/V18bUq
 7u6CD5c1MNRV7e6kV4a3CGAt99ADgp8Fnl+jevHeYl33pNT0mRV8bFSJmMCx07Ml
 Bvpt+hXo73S5IoKt1qNwNES0DMHfLBupaZJQ9Ty2GGwko6SxXhEpqqceamoxpt0S
 VSbcID0K8tl7k85O4GNl48al4TmuIBWZ0+BMbQdc0/E9tbeKaIaIHVfkXFnPj/EF
 1igYirMGRziZip/RhisQircSKcipFa+rGcEusl8V4xGndx48yySPJ8Yi8tTSKrRQ
 toVZYxvfJxHQNuM0lir1dXdWdnJXtHBLeAU+OYQAQABpad4wgXaaRbSkhM81eBA1
 TZyr/GuAdFFcEGlYNyrORipxHuzUMdDqOCl0IxORqdOhGCjGrsd/G5RLY8k/hpC0
 GV7f1aXK85PTqmEF2sdknlF3jrT1E3dalPPa09hjHkCmlHiKry+dxdsvTA3xfNk2
 DMtTvp1B4ZhVkdep6Zk33WQeSexaczHH1WByOwruGKAdsAM2SMXOkYCc5JV3xx2/
 QsuC7911Y3CEVnfGZXX+fRQKuy4/7HtNSZCU9yGgpEH4QXw03n2qxU5zUeryUsPq
 zACvrlpxpbySOIvAkrQw+kLlHKELzy1kbsixztS5A518oVW9vRxdD+8JNHjuCaCc
 khyXPKHV/NCkC5oxtepj
 =vjZI
 -----END PGP SIGNATURE-----

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
 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