d43b82dc82
Fix compilation with clang
...
The compilation error was
account.h:140:113: error: expected ')'
const QList< QPair<QString, QString> > &queryItems = QList< QPair<QString, QString> >());
^
followed by more errors.
The problem is because the compiler has hard time disambiguiating the comma
int foo(const QPair<int, int> &p = QPair<int, int>());
^
It is indeed quite hard for the compiler to know if this comma is a separation
between complate arguments or the separation between arguments of the functions.
Use the C++11 construct instead which does not need commas
2015-02-17 11:09:45 +01:00
ce195bd599
SyncEngine: add an getter to the journal
2015-02-17 11:08:16 +01:00
c0c8a22fa3
SyncEngine: pass a non-const reference to the SyncFileItemVector in aboutToPropagate
...
That way, users of the library can change the contents of the sync item vector.
2015-02-17 11:08:16 +01:00
151228b2a6
Fix build when compiling libsync without QtGui
...
Utility must stay QtGui-free, move the hidpiFileName to the theme which
is the only part in libsync which uses it, and already has #ifdefs
2015-02-16 10:24:42 +01:00
bd4f68233f
some typos, grammar and sentence fixes
2015-02-14 23:47:07 +01:00
d6bdbf9f34
Logger: use qFormatLogMessage with Qt 5.4 so it respects the Qt logging preferences
2015-02-14 14:23:01 +01:00
40dbc78407
concatUrl: Remove manual parsing, add test. #2817
2015-02-13 14:53:55 +01:00
957c9f060d
GeneralSettings: Add OpenSSL version number to about text
2015-02-12 23:23:47 +01:00
a7c97388a9
Fix Qt4 build for another error
2015-02-12 20:16:02 +01:00
86c480ee09
Fix Qt4 build
2015-02-12 20:10:31 +01:00
0184a00151
PropagateDirectory: make the code a bit more readable
...
Do not call slotSubJobFinished when there is are no sub jobs because
no sub jobs were finished. Instead just call a finalize method
2015-02-12 20:00:04 +01:00
b9161aa06c
libsync: Fix a case in which canceling the sync would result in some folder never being sync'ed
...
The problem occurs because of the sorting of items when we have things like
bigfolder
bigfolder/bigsubfolder
bigfolder-2
Then, because dashes come before slash in ascii, the bigfolder-2 would come before its content
and the propagator would thinkg bigfolder is empty and save the etag before it is processed
Should fix issue #2832
2015-02-12 20:00:04 +01:00
00e42d1177
More HIDPI support
...
Except for the non-native activity tab
icon in settings, this should fix #11
2015-02-12 19:44:40 +01:00
a2aef04f21
ConValidator: Avoid a double auth check during startup. #2801
2015-02-12 15:25:44 +01:00
063271e978
propagateupload: Disable parallel chunk upload for owncloud < 8
...
Issue #2743
2015-02-12 14:50:42 +01:00
438c4fe72e
Account: put the server version in the account
2015-02-12 14:50:42 +01:00
3439ea395b
Remove one more mention of certDate
2015-02-12 12:43:41 +01:00
ba3bab8f49
Remove certificateDate property and other superfluous code
2015-02-12 12:37:42 +01:00
9ba88f6baf
Windows: Sync .lnk files correctly. #2792
2015-02-12 11:27:58 +01:00
4f202e5f4c
Fix TokenCredentials compilation
2015-02-11 18:10:01 +01:00
5cdf448693
SyncJournal: Use DELETE journal mode on FAT filesystems. #2693
2015-02-11 14:03:55 +01:00
89c69250ef
Fix crash in discovery thread dtor.
...
Occasionally on Windows ~DiscoveryMainThread() triggered a crash.
Probably because the QMutableLinkedListIterator was destroyed after
it's underlying data had been removed (from the map).
Cleaning up the map and lists was redundant anyway, so the
destructor is changed to only explicitly destroy the vio_file_stat
objects.
2015-02-11 14:00:23 +01:00
f8b24ac34d
Fix reconnection after long network outage #2321
...
The problem was that StatusNotFound can indicate either a transient
network problem or a permanent server configuration problem.
2015-02-11 09:24:56 +01:00
d45d3892cb
Account: Fix path assembling with QUrl, add query items separately.
...
Otherwise Qt does encode the delimiter between path and query items.
This fixes bug #2804
2015-02-10 17:13:27 +01:00
51337a10af
LSCOL job: Fix getting the list of folders when there are non-ascii
...
Task #2795
2015-02-08 12:23:47 +01:00
1e57432aae
Propagator: Fix crash
...
This crash was uncovered when testing parallel chunks when one chunk
finished the upload. The propagate was then finished with the other
UploadDevices still being in-flight in the QNAM.
2015-02-06 11:19:41 +01:00
5ec793e045
propagateupload: Save the mtime given by the server in the reply to GET
...
There could be a race condition if the file was updated on the server
between the discovery and the propagate phase. By taking the mtime from
the server, we make sure that we do not have a race.
This is tested by t6.pl with BIG3.file because the script was modifying
the file between the two phases
2015-02-06 10:23:20 +01:00
eaa9c4fdf8
json capital
2015-02-05 20:41:08 +01:00
856df4c5f6
libsync: Get the capabilities and store it in the account
2015-02-05 15:42:56 +01:00
34237f604e
JsonApiJob: Refactor out of the shibbolethuserjob
2015-02-05 15:42:01 +01:00
3dd8ce08b8
Parallel chunk upload: Fix a off-by-one while saving the done chunk in the DB
...
We should assume that the chunk currently uploading is NOT done (hence the -1)
il task 405
2015-02-04 18:52:26 +01:00
acb7e972ea
Merge pull request #2778 from jturcotte/master
...
Allow building natively on Windows with MinGW
2015-02-04 17:11:56 +01:00
1ac523ec01
Output libocsync and libowncloudsync in the bin directory
...
Windows finds DLLs using PATH or the directory of the process'
executable. By outputing those dependend DLLs together with
owncloud.exe, the developer only need to have OpenSSL's bin
and the qtkeychain build directory in his PATH to let the
dynamic linker find them.
As the documentation of RUNTIME_OUTPUT_DIRECTORY points out,
this only affects windows as other platforms don't consider
libraries as runtime targets.
2015-02-04 15:00:22 +01:00
ca56e5d9ca
SyncEngine: Fix crash
...
We must check if 'it' is not == to begin() before doing it-1
Also i believe the logic was reversed if it was begin()
Task #2765
2015-02-04 14:52:41 +01:00
43a51c1bef
Fix the MinGW build
...
- qtkeychain isn't necessarily in a qt5keychain subdirectory.
- Explicitly add OpenSSL to the include directories
- Make sure that the USE_OUR_OWN_SQLITE3 code is initialized
for csync by calling find_package.
2015-02-04 14:50:38 +01:00
49021fd96d
SyncJournal: Reset all prepared statements. #2757
...
Makes closing of the database actually release file locks.
2015-01-30 15:35:42 +01:00
db6214e090
SyncEngine: Do not assert when the neon session is 0
...
It can now be 0 if neon is not in used
Issue #2755
2015-01-30 01:05:46 +01:00
332601ed26
Remove noisy debug output
2015-01-29 15:37:21 +01:00
43d6dbb0f2
SQL: Add debugging options. #2693
...
OWNCLOUD_SQLITE_JOURNAL_MODE: To use something else than WAL
OWNCLOUD_SQLITE_TEMP_STORE: To test with storing temporaries in memory.
2015-01-29 11:02:01 +01:00
cd0ad21132
SQL: Improve error reporting of failed exec(). #2693
2015-01-29 09:47:48 +01:00
5fc231cda4
Shib: Fix fetching of 'user'. #2751
2015-01-28 15:15:35 +01:00
d70e146c1f
Merge remote-tracking branch 'origin/ssl_client_cert'
...
Conflicts:
CMakeLists.txt
csync/src/CMakeLists.txt
csync/src/csync_owncloud.c
2015-01-28 14:13:40 +01:00
989005d616
Clientcert support: Explictly link libsync against openssl
2015-01-28 13:31:17 +01:00
b0dbb49ca8
Shib: fix broken signal/slot connections
2015-01-26 16:23:43 +01:00
9abc3e1333
fixes required by upstream
2015-01-23 19:22:56 +00:00
dcba129a98
Make it compile without neon
2015-01-23 17:56:46 +01:00
b856266e91
Remove neon link flag when not required
2015-01-23 17:35:17 +01:00
fe51ada1e8
Don't require NEON with Qt 5.4
2015-01-23 17:11:34 +01:00
12ac9f9aa9
Discovery: Fix broken signal/slots
2015-01-23 15:37:36 +01:00
3885d5d706
Discovery: Report root etag from engine to folder
...
For #2352
2015-01-23 15:30:44 +01:00
2943b4a85a
CMake: Fixed the rpath settings to make the nighlies build again.
2015-01-23 11:50:42 +01:00
0f98a90858
Wizard: Add an option in the theme to default to nothing selected in the selective sync
...
Issue #2580
2015-01-22 15:57:55 +01:00
3c26bfa618
Propagate Remote mkdir: save the fileid to the database early
...
It's important so that if we delete or rename a diectory that is being
uploaded, this is properly detected
2015-01-22 15:11:04 +01:00
0502f684e9
Discovery: Even less qDebug
2015-01-22 14:45:08 +01:00
45cb679ea7
Discovery: Less verbose debug
2015-01-22 14:37:35 +01:00
c9f9d55658
Merge branch 'qnam_csync_update'
...
Conflicts:
src/libsync/networkjobs.cpp
2015-01-22 14:34:36 +01:00
dde8e35785
Discovery: Put results into proper place in map
...
The map is for memory management.
It can later be used as a cache for the recursive PROPFIND
(if we decide to activate it again)
2015-01-22 14:25:24 +01:00
ba8b1bbe06
adds 'SSL client certificate' support from n.octeau with qknight changes as:
...
* removed broken QSsl::SslV3 default
* rewrote slotHandleErrors(): no longer claim errors which are none.
* hack reverted: lib64 was not the cause for NixOS issues related to libraries.
* refactored csync/src/csync_owncloud.c and discovered+fixed why the dav_connect was never getting the certPath+certPassoword
* cleanup of code but seems this crushed the ssl client certificate support
* fixes the https://github.com/owncloud/client/issues/69#issuecomment-69358377 issue
* lots of cleanup
* From TODO list : translate all french comments into english
* changed _pemCertificate type from QString to QByteArray
2015-01-21 23:55:11 +00:00
0e86ceff73
Connection Validator: let the user cancel the password dialog
...
And don't ask for the password again if this happens
2015-01-21 15:33:51 +01:00
d8b621d05f
LsColJob: fix getting the sizes when the path contains %-encoded chars
2015-01-21 12:04:54 +01:00
c580275a01
Discovery: Delete file entries on destruction
2015-01-20 18:49:27 +01:00
5c2298fa37
Discovery phase: fix a few warnings
2015-01-20 18:50:03 +01:00
906779c4b1
SyncEngine: Use QNAM for csync_update
...
This is for #2507
2015-01-20 18:27:25 +01:00
aa6a5e4ac2
Credentials: Use the bound account everywhere.
...
This is preparation for multiaccount.
2015-01-16 15:22:56 +01:00
91fce3ea73
Make public API explicit about blacklist kind. #2301
...
'blacklist' can mean the selective sync blacklist or the error
blacklist. Names in public API are now explicit about which
blacklist is meant.
2015-01-16 10:17:19 +01:00
b50475bc17
SQL: Fix error reporting on prepare fail. #2697
2015-01-16 09:12:25 +01:00
40c802b148
Download: Handle locking problems as soft errors, enterprise #455
2015-01-15 20:51:30 +01:00
7d9f917810
Filesystem: Check more return values and more logging.
2015-01-15 20:51:30 +01:00
22ad34fa0e
Merge branch '1.7'
...
Conflicts:
admin/win/nsi/l10n/French.nsh
src/mirall/propagator_qnam.cpp
2015-01-15 17:58:43 +01:00
907b79d3b8
Utility: Use appropriate unit when converting from bytes to human readable units
...
We must not use the SI units if we use power of 2
I believe that we should use SI units and power of 10
But since the server still use power of 2, we need to show the same numbers
But at least we use the proper standard IEC unit that are explicit
2015-01-15 14:06:17 +01:00
863731fd6a
Revert "Utility: Use SI units"
...
This reverts commit 7445fa7ef7f654c53c35
2015-01-15 13:56:51 +01:00
264471af43
csync: cleanup some unused error code
2015-01-15 12:19:06 +01:00
08d3ae9f02
csync_statedb: Have more granular error reporting when the loaddb fails
...
In order to distiguish error from sqlite_open or from the integrity check
Issue #2673
2015-01-15 11:36:24 +01:00
0af5574951
Propagate upload: code cleanup
2015-01-14 15:20:02 +01:00
0ae9055ea6
Propagator upload: Fix UploadDevice::seek
2015-01-14 15:08:09 +01:00
885aafcea3
SelectiveSync dialog: Show the sizes of the folder
2015-01-14 15:08:09 +01:00
7445fa7ef7
Utility: Use SI units
2015-01-14 15:08:09 +01:00
a544133d73
Propagator: Guard access to BandwidthManager
...
Shouls fix #2623
2015-01-14 14:28:47 +01:00
b3c02798a3
Propagator: Use FILE_SHARE_DELETE on Windows. #2070 #2597
2015-01-14 14:16:05 +01:00
3ec19ee355
Propatage upload: Preload the chunk in memory and close the file
...
This should solve #2675 and #1981
By preloading the chunks in memory before sending them, we don't keep the
file open and therefore we let other program open the file for writing.
If the file is modified between two chunks, we detect that and abort anyway
2015-01-14 13:46:51 +01:00
0215b250af
UploadDevice: mark overrided method as Q_DECL_OVERRIDE
2015-01-14 13:46:51 +01:00
6a0c9fdd34
Propagate upload: Change the default chunk size to 5MiB and make chunk upload parallel
...
The server is slow to process each chunk. As a result the time between
the chunks is not neglectible. Therefore we gain a lot of time by
uploading the chunks in parallel. So the bandwitdh is used when the
server is waiting between chunks.
2015-01-14 13:46:51 +01:00
7f1593c5d7
PropagateUpload: The PUTJob owns the chunk device, so make it a QScopedPointer instead of a QSharedPointer
2015-01-14 13:46:51 +01:00
5e0d4ab31d
Further Windows compile fix
2015-01-12 09:50:37 +01:00
cefa31eb82
fix typo
...
suggested by transifex translator
2015-01-11 14:07:04 +01:00
c86d8e5acf
Clean up BSD support patch
2015-01-08 22:40:47 +01:00
4a819026df
Merge pull request #2634 from ryo-on/netbsd-support
...
Support NetBSD like FreeBSD or Linux.
2015-01-08 22:35:44 +01:00
c3468b7ed6
Merge remote-tracking branch 'origin/master' into accountstate
...
Conflicts:
src/gui/owncloudsetupwizard.cpp
src/gui/owncloudsetupwizard.h
src/libsync/propagatedownload.cpp
src/libsync/propagatedownload.h
2015-01-08 15:33:39 +01:00
3f5c1d2ade
Merge pull request #2678 from chrodan/master
...
Hide Ignored files in context menu
2015-01-08 14:29:36 +01:00
dd063d0207
Add hack to make old themes work
2015-01-08 14:21:58 +01:00
309ff2997c
potential fix for #1865
...
Do not show ignored files in context menu
2015-01-08 11:42:14 +01:00
ab0bc75e43
PropagateUploadFileQNAM::slotUploadProgress: Fix inverted condition
...
( Apply this commit 2d8053a9df
2015-01-05 17:32:12 +01:00
414ac5433d
Merge branch '1.7'
...
Conflicts:
binary
doc/accountsetup.rst
doc/architecture.rst
doc/navigating.rst
doc/owncloudcmd.rst
doc/troubleshooting.rst
2015-01-05 14:40:53 +01:00
16c4864e67
Support NetBSD like FreeBSD or Linux.
2014-12-21 23:00:56 +09:00
4fa212c43b
CSync callbacks: Don't use global account.
2014-12-18 15:39:51 +01:00
38ebfec1fb
Use global Account/AccountState less.
...
* Use a shared pointer to Account everywhere to ensure
the instance stays alive long enough for a sync to terminate
* Folder is now tied to an AccountState
* SyncEngine and OwncloudPropagator tie to an Account and use that
for all jobs they run
Issue: Since the setup wizard currently always replaces the
account, it will always wipe all folder definitions, even when
the actual changes to the account were minor.
2014-12-18 15:39:51 +01:00
6c7acd585e
Account: Split into libsync/Account and gui/AccountState.
...
This allows all the account state information to live in gui
while the sync-relevant data stays in libsync.
I also moved quotainfo to gui since it depends on the account state.
2014-12-18 15:39:51 +01:00
e8efaa5ed8
Direct download URL: Fix resuming
...
The server might support resuming, so don't always erase the temporary file
and pass the startSize, so the temporary file will be remove if the server
does not support it after all (because it is not sending the "bytes" header
Also pass the expected etag for consistency even if it's not used in this case.
2014-12-18 12:13:12 +01:00
96872e2b3b
Download: When direct URL don't work, retry through webdav
2014-12-17 14:28:13 +01:00
a006c6962c
Move account state related logic into Account.
...
The account state is now managed mostly by the Account itself
instead of through Application. The gui can still control whether
an account is signed out or not.
2014-12-17 12:01:10 +01:00
b1d392e415
Download job: allow redirect on direct download link
...
Issue #2614
2014-12-16 11:51:25 +01:00
cbf00e9378
Connection Validator: Fix connection warning
...
The timeout signal does not exist.
Timeout is handled as a normal network arror.
2014-12-16 11:48:15 +01:00
3ee14164db
network jobs: Refactor the redirect handling in AbdtractNetworkJob
...
Move the redirect handling from CheckServerJob to AbstractNetworkJob, so we can
later use it in any job (in preparation for task #2614 )
2014-12-16 11:27:02 +01:00
9a13ec736d
Fix OS X compilation
2014-12-11 15:08:13 +01:00
1a3041690f
ConValidator: Simplify and cleanup.
...
* This way using it with multiple accounts will be easier.
* Timeouts on the authed requests are handled.
2014-12-11 14:48:01 +01:00
d8c59fcb73
Use connection validator to ping the server. #2485
...
* Stop the quota job from having an effect on account status
as it can sometimes take a long time to reply. See #2485 and
owncloud/core#12744 .
* Instead of indirectly using the quota job, use the connection
validator to regularly ping the server with a basic PROPFIND for
'getlastmodified' on /.
This request was usually fast for users even when the quota PROPFIND
was slow.
2014-12-10 13:40:11 +01:00
53d5de685c
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/gui/folder.cpp
src/gui/folder.h
src/libsync/networkjobs.cpp
src/libsync/owncloudpropagator.h
src/libsync/propagatedownload.cpp
2014-12-10 13:01:36 +01:00
a2b817f0c0
mirall.qrc -> client.qrc
2014-12-08 18:00:29 +01:00
d5f2c36abd
Mirall -> (Desktop) Client
2014-12-08 17:54:32 +01:00
d86b3f04b1
Merge branch 'master' into rename_client
2014-12-08 17:44:04 +01:00
a42709f814
Namespace fixes
2014-12-02 14:20:13 +01:00
3016844dd7
Merge branch 'master' into rename_client
...
Conflicts:
README.md
src/gui/folderman.cpp
src/gui/settingsdialog.cpp
src/libsync/accessmanager.cpp
src/libsync/propagateupload.h
2014-12-02 13:37:22 +01:00
92ce707268
Bandwidth: Fix issue with removed download jobs
...
The measuring broke when a job that is currently measuring was removed.
2014-12-02 09:37:48 +01:00
fb3f5d86cf
Fix compilation after merge
2014-12-01 14:41:39 +01:00
512492bf30
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/libsync/propagatedownload.cpp
2014-12-01 14:37:47 +01:00
3253cc38b2
Propagator upload: Mark error while opening the file as SoftError
...
Because otherwise a lot of error are shown to the user when
the user deletes a directory that is syncing
Task #1981
2014-12-01 12:22:52 +01:00
fc3a8b944e
Propagator: Don't forget to mark the direcotry as finished if its first job fails
...
Otherwise we would go ahead and propagate the content of the directory
2014-11-27 15:36:13 +01:00
c9c1547813
Compile with Qt4
...
(QSharedPointer::reset is only in Qt5)
2014-11-25 16:24:47 +01:00
9a8c868793
Propagator upload: Remove debug output
2014-11-25 15:34:06 +01:00
13ec5da84e
neon jobs: Start them in their thread.
2014-11-25 15:08:32 +01:00
734db6f932
propagate Upload: Let the poll job count for a job
...
In order to avoid that there are many concurrent poll jobs that takes
all the QNAM channel and causes timeouts of queued jobs
2014-11-24 13:33:13 +01:00
d76e3c0488
Parallel chunk upload: abort all chunks if one of them errors out
2014-11-24 12:05:25 +01:00
c0de20dda0
UploadDevice: reduce debug verbosity
2014-11-24 12:05:25 +01:00
79c37f9fe4
Poll Jobs: Properly use DB index
...
Why do we sometimes use 0-based, sometimes 1-based indices?
2014-11-24 11:35:39 +01:00
c460b3f3be
Bandwith manager: It needs do be initialiazed after the limits of the propagator
2014-11-21 16:55:46 +01:00
78362af168
Compile with TOKEN_AUTH_ONLY
...
(QtGui is not included in that case)
2014-11-21 12:15:41 +01:00
1c58b75ac2
Merge branch '1.7'
2014-11-21 11:08:20 +01:00
8b45d1c928
Sync: Change force-sync interval to 2h everywhere. #2297
2014-11-20 13:38:32 +01:00
0fe7a69b39
FolderWatcher: Detect own changes. #2297
2014-11-20 13:16:29 +01:00
d04eedeb8d
OSX: Trust the file watcher. #2297
...
* Use a bigger default force sync interval (2h)
* Allow the file watcher to schedule a sync while a sync for
the same file is running.
2014-11-20 12:42:59 +01:00
f275002ebe
Merge branch '1.7'
2014-11-20 12:41:06 +01:00
4d7b8bdb25
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
OWNCLOUD.cmake
test/CMakeLists.txt
test/testfolderwatcher.h
2014-11-19 14:45:25 +01:00
3706c76622
useLegacyJobs: Fix logic.
2014-11-19 10:31:42 +01:00
9a6710e330
Propagator: add a bit of documentation comments
2014-11-18 17:54:53 +01:00
1113980b20
Propagator: Change the scheduler
...
It still needs to be a bit optimized, but it allows to paralelized jobs between directories
(this is required to paralelize the mkcol)
2014-11-18 17:35:31 +01:00
a3b21022af
new bandwith limiting: Do a test on the Qt version to activate it
...
We need Qt 5.3.3.
If the compiled qt version is Qt 5 but smaller than Qt 5.3.3, do a runtime
check.
OWNCLOUD_NEW_BANDWIDTH_LIMITING is still there for a special setup in which
we patch Qt with the patches
2014-11-14 17:29:28 +01:00
ad92e7b888
Move UploadDevice to the right header
2014-11-14 16:40:13 +01:00
c73522de2e
Remove ChunkBlock
...
It is not in used
2014-11-14 16:39:39 +01:00
14f5e8e32e
Move all the neon code to the _legacy files
2014-11-14 16:13:50 +01:00
f3797abecf
Fix the PropfindJob
...
-the namespace mangling was wrong
-And the way we read the reply did not work
2014-11-14 15:03:48 +01:00
1310bef528
Port the propagate mkdir to QNAM
...
This way we can make it parallel
2014-11-13 18:57:07 +01:00
7246011b62
Merge pull request #2459 from owncloud/typo
...
fix typo
2014-11-12 00:09:22 +01:00
281c0e1553
Merge branch 'master' into rename_client
...
Conflicts:
CMakeLists.txt
src/gui/main.cpp
src/libsync/accessmanager.cpp
src/libsync/accessmanager.h
src/libsync/owncloudpropagator_p.h
2014-11-12 00:07:59 +01:00
cdac8d56d5
Merge remote-tracking branch 'origin/master' into crashreporter
...
Conflicts:
src/libsync/utility.cpp
src/libsync/utility.h
2014-11-11 23:53:38 +01:00
7b4be209aa
MOVE: fix moving with special character.
...
The Destination header need to be %-encoded
2014-11-11 16:27:06 +01:00
c712b7c46c
Parallel MOVE by porting the job to qnam
2014-11-11 16:09:01 +01:00
22c6892870
DELETE: Error out if the HTTP code is not 204
2014-11-11 14:32:25 +01:00
134650eb44
Parallel DELETE
2014-11-11 13:19:29 +01:00
506ba022f1
Split propagator_qnam.cpp into propagateupload.cpp and propagatedownload.cpp
2014-11-11 12:17:10 +01:00
fc6d572a6c
Make compile against Qt4
2014-11-11 10:10:46 +01:00
b54c079766
Adjust issue urls
2014-11-09 23:38:07 +01:00
2db17a57d2
Fix header names
2014-11-09 23:25:57 +01:00
a992c5b8d3
Fix build
2014-11-09 23:10:18 +01:00
d57d3cf1f6
Drop Mirall from strings
2014-11-09 22:35:29 +01:00
ae85aa33fd
Adjust namespaces
2014-11-09 22:34:07 +01:00
f2eadacf09
Remove "Mirall" from class names
2014-11-09 22:30:29 +01:00
9ebc41ed6f
Remove "Mirall" from cmake project files
2014-11-09 22:30:05 +01:00
98a283b4ec
Fix clang warnings
2014-11-08 11:21:48 +01:00
d524f6b395
Fix compilation errors after merge
2014-11-08 11:11:05 +01:00
6b716683e2
Merge the long PUT Poll URL feature with the new sql backend
2014-11-08 11:09:50 +01:00
ba2c33af0b
Fix the il branch merge: Move the bandwidthmanager to libsync
2014-11-08 10:52:14 +01:00
de11f602d5
Merge remote-tracking branch 'origin/il'
...
Conflicts:
csync/src/csync_private.h
src/CMakeLists.txt
src/gui/folder.cpp
src/libsync/owncloudpropagator.cpp
src/libsync/owncloudpropagator.h
src/libsync/propagator_qnam.cpp
src/libsync/propagator_qnam.h
src/libsync/syncengine.cpp
src/libsync/syncengine.h
src/mirall/syncjournaldb.cpp
2014-11-08 10:48:36 +01:00
260c8e0227
fix typo
2014-11-07 17:51:15 +01:00
f25d175b5d
Merge remote-tracking branch 'origin/1.7'
2014-11-06 19:54:20 +01:00
ef16c409ef
Merge pull request #2393 from svkurowski/issue-2215
...
Switch monochrome systray icon color depending on systray brightness
2014-10-29 14:54:33 +01:00
b9b9f3c136
Propagator: Schedule a resync immediately if file is modified during upload
2014-10-29 13:10:56 +01:00
4e20a02fe5
SyncJournalDB: Add filesize column to metadata.
...
* Alter table to include column.
* Make get/set in SyncJournalDB store and load it.
* Make csync recover the stat_t's size member from it.
2014-10-29 09:53:36 +01:00
dc1e73dcb7
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/libsync/syncjournaldb.cpp
test/CMakeLists.txt
2014-10-28 23:27:58 -04:00
e5b03634ae
correct spelling on user is empty error.
2014-10-25 11:01:58 -05:00
59f18583d1
Switch monochrome systray icon color depending on systray brightness.
...
https://github.com/owncloud/mirall/issues/2215
As of version 10.10 Yosemite, Mac OS X offers the user the option to use
a dark version of the dock and menu bar. The systray icon was black even
on the dark menu bar, thus rendering it nearly impossible to spot.
2014-10-24 21:52:41 +02:00
c832226aa1
Merge remote-tracking branch 'origin/1.7' into master
2014-10-22 12:25:58 +02:00
a20375372d
Blacklist: Don't ignore error files forever. #2247
...
Instead try them again regularly, but don't show the user any
error messages if the error persists.
2014-10-22 12:25:18 +02:00
7ae0338f5c
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/socketapi.h
src/libsync/syncengine.h
test/CMakeLists.txt
2014-10-22 10:41:55 +02:00
50e718b1e7
Merge branch '1.7'
...
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/folder.cpp
src/gui/socketapi.cpp
translations/mirall_ca.ts
translations/mirall_cs.ts
translations/mirall_de.ts
translations/mirall_el.ts
translations/mirall_en.ts
translations/mirall_es.ts
translations/mirall_es_AR.ts
translations/mirall_et.ts
translations/mirall_eu.ts
translations/mirall_fa.ts
translations/mirall_fi.ts
translations/mirall_fr.ts
translations/mirall_gl.ts
translations/mirall_hu.ts
translations/mirall_it.ts
translations/mirall_ja.ts
translations/mirall_nl.ts
translations/mirall_pl.ts
translations/mirall_pt.ts
translations/mirall_pt_BR.ts
translations/mirall_ru.ts
translations/mirall_sk.ts
translations/mirall_sl.ts
translations/mirall_sv.ts
translations/mirall_th.ts
translations/mirall_tr.ts
translations/mirall_uk.ts
translations/mirall_zh_CN.ts
translations/mirall_zh_TW.ts
2014-09-18 17:10:21 +02:00
bcff1ced5e
Merge branch '1.7'
...
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/folderman.cpp
src/gui/wizard/owncloudadvancedsetuppage.cpp
src/libsync/account.cpp
2014-08-29 20:40:33 +02:00
89aec52503
Add checkbox to general settings to disable the crash reporter
2014-08-28 16:19:17 +02:00
cf12a56b4c
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/gui/socketapi.cpp
2014-08-27 18:22:07 +02:00
17e16f5e79
Add "Crash" entry to systray if started with --debug
2014-08-26 15:46:24 +02:00
b176ff6626
Don't use CMAKE_INSTALL_PREFIX for RPATH
2014-08-26 15:19:46 +02:00
e5471d8318
Build after merge
2014-08-26 14:33:21 +02:00
902bb7a198
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
...
Conflicts:
src/CMakeLists.txt
src/gui/accountsettings.cpp
src/gui/folderwizard.cpp
src/gui/settingsdialog.cpp
src/libsync/syncengine.h
2014-08-26 11:29:42 +02:00
4fc044d368
Merge branch 'master' into move_lib_to_sep_dir
...
Conflicts:
cmake/modules/NSIS.template.in
src/CMakeLists.txt
src/creds/shibboleth/authenticationdialog.cpp
src/creds/shibboleth/authenticationdialog.h
src/gui/owncloudgui.cpp
src/libsync/creds/shibboleth/authenticationdialog.cpp
src/libsync/creds/shibboleth/authenticationdialog.h
src/libsync/mirallaccessmanager.cpp
src/mirall/authenticationdialog.cpp
src/mirall/authenticationdialog.h
2014-08-12 21:08:44 +02:00
bb32831a60
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
...
Conflicts:
src/gui/folderman.cpp
2014-07-17 11:31:45 +02:00
df3c3bca02
Split into three separate projects: library, gui and cmd
2014-07-11 11:07:31 +02:00
Olivier Goffart