Christian Kamm
191d66fc6f
Propagator: Add entry with dummy etag on local mkdir. #2761
2015-06-17 14:38:51 +02:00
Jocelyn Turcotte
c98bcc8e9e
OS X: Fix a few warnings
2015-06-17 14:32:34 +02:00
Jocelyn Turcotte
a4f519eaeb
Reduce the amount of rebuild needed after a git commit
...
Since GIT_SHA1 would need to be updated in config.h, all files
including it would be rebuilt by make.
Reduce the number of files to rebuild by moving this variable
to version.h instead.
2015-06-17 14:32:34 +02:00
Olivier Goffart
c11358219a
FolderStatusModel: fix a coverity warning
2015-06-17 12:46:49 +02:00
Christian Kamm
28d6d0dc1e
Download: Gracefully skip files with 404. #2227
2015-06-17 12:24:21 +02:00
Jocelyn Turcotte
977b1464b5
shell_i: Don't load the old extension in >= 10.10 #2340
2015-06-16 15:30:43 +02:00
Olivier Goffart
d902a37dfd
Fix Qt4 compilation
...
This header is not included in Qt4's QAbstractItemModel header
2015-06-16 12:14:04 +02:00
Olivier Goffart
0cfc518c33
Fix coverity build which does not support nsdmi
2015-06-16 09:30:29 +02:00
Olivier Goffart
f8cbed34c2
Should fix coverity build
...
Issue #3346
2015-06-15 17:59:08 +02:00
Olivier Goffart
2e177590a6
libsync: Remove some Theme dependency
...
Theme will eventually be moved to the GUI
Theme::appNameGUI and QApplicaiton::applicationName are the same, it is currently
set in the constructor of ConfigFile
2015-06-15 17:39:28 +02:00
Olivier Goffart
7f0735a955
Account: don't use the Theme from the account
...
The Theme will be moved to GUI
The server URL is anyway overriden by the wizard or the accountmanager
2015-06-15 17:39:28 +02:00
Olivier Goffart
ce0a0e3f0d
Credential: move the implementation to the gui
2015-06-15 17:39:28 +02:00
Olivier Goffart
6e337ad242
Move Account::settings to AccountState::settings
...
It is only used by the GUI. Also return a unique_ptr to make the ownership clearer
2015-06-15 17:39:28 +02:00
Jocelyn Turcotte
bfcfdeec64
shell_i: Use an NSConnection instead of a local socket #2340
...
This prepares the switch to the official FinderSync API on Yosemite
which requires the extension to run in a sandbox. This complicates
the usage of a local socket to communicate with a non-sandboxed GUI
client. An NSConnection is easier to use in this case, which we can
use as long as the server name (i.e. Mach port registered name) is
prefixed with the code signing Team Identifier.
A placeholder server implementation is also added to the client's
SocketApi which basically reproduces the interface of a QLocalSocket.
Most of the references to individual sockets we're only using
QIODevice methods so the type was simply reduced. A typedef to
replace the QLocalServer was the only other part needed.
2015-06-15 15:28:17 +02:00
Olivier Goffart
e321280eae
AccountManager: remove export macro
2015-06-15 14:53:36 +02:00
Olivier Goffart
a3c543a627
Move FolderStatusDelegate to its own file
2015-06-15 14:16:21 +02:00
Klaas Freitag
fa0faee8ba
Frequent update check: read check frequency from config file.
2015-06-15 12:24:18 +02:00
Olivier Goffart
bea8896012
Merge remote-tracking branch 'origin/master' into new-ui
2015-06-14 10:39:30 +02:00
Olivier Goffart
1dabdc7df1
discoveryphase: initialize DiscoveryMainThread::_currentGetSizeResult
2015-06-12 14:43:18 +02:00
Olivier Goffart
11c8415cd6
Coverity do not support non-static data initializer
...
Fixes #3337
2015-06-12 13:57:17 +02:00
Olivier Goffart
81c10da8dc
Accountsettings: Show a notification when there are new unconfirmed folders
2015-06-12 12:19:24 +02:00
Olivier Goffart
2296f6a4a5
Fix Qt4 build
...
QSharedPointer::create with arguments is new in Qt5
2015-06-12 08:13:08 +02:00
Olivier Goffart
53f2468430
Confirm: Set the limit to 100MB
...
TODO: make this configurable
2015-06-11 15:54:39 +02:00
Olivier Goffart
cc3543dbd2
Confirm feature: The UI part in the selective sync view
...
Folder that are over the threshold will appear in red in the
selective sync view and will be deselected by default
2015-06-11 15:46:01 +02:00
Olivier Goffart
05ed126bfd
Account config: add the size in the selective sync part
2015-06-11 14:13:09 +02:00
Olivier Goffart
5ab20e64bf
AccountSettings: fix selective sync checking
...
We need to set the root item to partially checked in case there
is some folders in the blacklist
The root item do not have checkmark so it is good
2015-06-10 17:00:08 +02:00
Olivier Goffart
e9e11d251f
Fix compilation after merge of the confirm and the new-ui branch
2015-06-10 16:22:14 +02:00
Olivier Goffart
139b28b471
Merge branch 'master' into new-ui
...
Conflicts:
src/gui/folder.cpp
src/gui/folder.h
src/gui/folderman.cpp
2015-06-10 15:57:55 +02:00
Olivier Goffart
16786eed54
Merge pull request #3281 from owncloud/confirm
...
Confirm feature (sync engine part only)
2015-06-10 13:39:52 +02:00
Olivier Goffart
e135d4cccf
Merge remote-tracking branch 'origin/1.8'
2015-06-10 13:42:02 +02:00
Klaas Freitag
c8cb604c18
Updater: Do a tray notification if a new update is available.
2015-06-09 08:35:15 +02:00
Klaas Freitag
5b65bbf8e5
App: Do a regular check for updates, currently hardcoded every two hours.
2015-06-09 08:35:15 +02:00
Olivier Goffart
67f7892958
SocketAPI: Do not leak open DB or query
...
We could leak it in case of errors. Or when the folder is removed.
Make use of QSharedPointer to avoid leaks
2015-06-08 15:49:37 +02:00
Olivier Goffart
6df7551bdd
DiscoveryPhase: Fix the unlikely case the server resturns utf-8 in permissions
...
UTF-8 size might be bigger than the size of the QString
In that case we would end up with a non-nill terminated permissions.
2015-06-08 15:40:06 +02:00
Olivier Goffart
1b9d82679c
OwnSQL: fix initialisation of variables
2015-06-08 15:30:39 +02:00
Olivier Goffart
2c6c21d753
AccountState: do not change the state when we stay connected
...
This would cause a full sync every 30 seconds.
2015-06-08 12:14:37 +02:00
Volkan Gezer
03eb11b927
from translators on transifex
2015-06-07 14:19:59 +02:00
Klaas Freitag
fc2ceb88fb
Rename thread to SyncEngine Thread to avoid confusion about Neon.
2015-06-06 10:49:47 +02:00
Christian Kamm
ee08b3759d
SyncScheduling: Avoid new resyncs on local mkdir.
...
(cherry picked from commit bacf6166c1
2015-06-05 10:27:28 +02:00
Christian Kamm
bacf6166c1
SyncScheduling: Avoid new resyncs on local mkdir.
2015-06-04 15:02:24 +02:00
Christian Kamm
2ed329e025
Improve reporting of server error messages. #3220
...
In particular the 'unsupported client version' error message
is now visible to the user when trying to connect to a
server that no longer supports the current client version.
2015-06-04 10:07:24 +02:00
Christian Kamm
4c10f1e40c
Wizard: Show server error message if possible. #3220
2015-06-03 16:33:09 +02:00
Olivier Goffart
02ffbf8989
confirm feature: fix typos spotted by ckamm
2015-06-03 15:20:42 +02:00
Christian Kamm
89376e14d6
Nicer fix for the security issue #3283 .
2015-06-03 11:37:26 +02:00
Christian Kamm
e32bd5a59f
Merge remote-tracking branch 'origin/1.8'
2015-06-03 11:36:52 +02:00
Olivier Goffart
12f760535d
Fix folder concatenation with Qt4
...
QUrl in Qt4 do not simplify double slashes like Qt5 does, so we have
to take in account different slashes possibilities
2015-06-02 20:47:06 +02:00
Olivier Goffart
e1f94cea4f
FolderStatusModel: handle network error in the LSCol
2015-06-02 20:47:06 +02:00
Olivier Goffart
fc23e810fd
folderstatusmodel: clean includes
2015-06-02 20:01:13 +02:00
Olivier Goffart
e587c8e2dc
multi-account: compile with Qt4
2015-06-02 19:57:41 +02:00
Olivier Goffart
984434c728
AccountSettings: move the progress handling in FolderStatusModel
...
This is required to compile with Qt4 because signals were protected.
And the logic anyway belongs to the model
2015-06-02 19:45:23 +02:00
