Christian Kamm
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
Daniel Molkentin
a2b817f0c0
mirall.qrc -> client.qrc
2014-12-08 18:00:29 +01:00
Daniel Molkentin
d5f2c36abd
Mirall -> (Desktop) Client
2014-12-08 17:54:32 +01:00
Daniel Molkentin
d86b3f04b1
Merge branch 'master' into rename_client
2014-12-08 17:44:04 +01:00
Daniel Molkentin
a42709f814
Namespace fixes
2014-12-02 14:20:13 +01:00
Daniel Molkentin
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
Markus Goetz
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
Olivier Goffart
fb3f5d86cf
Fix compilation after merge
2014-12-01 14:41:39 +01:00
Olivier Goffart
512492bf30
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/libsync/propagatedownload.cpp
2014-12-01 14:37:47 +01:00
Olivier Goffart
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
Olivier Goffart
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
Olivier Goffart
c9c1547813
Compile with Qt4
...
(QSharedPointer::reset is only in Qt5)
2014-11-25 16:24:47 +01:00
Olivier Goffart
9a8c868793
Propagator upload: Remove debug output
2014-11-25 15:34:06 +01:00
Olivier Goffart
13ec5da84e
neon jobs: Start them in their thread.
2014-11-25 15:08:32 +01:00
Olivier Goffart
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
Olivier Goffart
d76e3c0488
Parallel chunk upload: abort all chunks if one of them errors out
2014-11-24 12:05:25 +01:00
Olivier Goffart
c0de20dda0
UploadDevice: reduce debug verbosity
2014-11-24 12:05:25 +01:00
Markus Goetz
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
Olivier Goffart
c460b3f3be
Bandwith manager: It needs do be initialiazed after the limits of the propagator
2014-11-21 16:55:46 +01:00
Olivier Goffart
78362af168
Compile with TOKEN_AUTH_ONLY
...
(QtGui is not included in that case)
2014-11-21 12:15:41 +01:00
Olivier Goffart
1c58b75ac2
Merge branch '1.7'
2014-11-21 11:08:20 +01:00
Christian Kamm
8b45d1c928
Sync: Change force-sync interval to 2h everywhere. #2297
2014-11-20 13:38:32 +01:00
Christian Kamm
0fe7a69b39
FolderWatcher: Detect own changes. #2297
2014-11-20 13:16:29 +01:00
Christian Kamm
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
Christian Kamm
f275002ebe
Merge branch '1.7'
2014-11-20 12:41:06 +01:00
Christian Kamm
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
Christian Kamm
3706c76622
useLegacyJobs: Fix logic.
2014-11-19 10:31:42 +01:00
Olivier Goffart
9a6710e330
Propagator: add a bit of documentation comments
2014-11-18 17:54:53 +01:00
Olivier Goffart
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
Olivier Goffart
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
Olivier Goffart
ad92e7b888
Move UploadDevice to the right header
2014-11-14 16:40:13 +01:00
Olivier Goffart
c73522de2e
Remove ChunkBlock
...
It is not in used
2014-11-14 16:39:39 +01:00
Olivier Goffart
14f5e8e32e
Move all the neon code to the _legacy files
2014-11-14 16:13:50 +01:00
Olivier Goffart
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
Olivier Goffart
1310bef528
Port the propagate mkdir to QNAM
...
This way we can make it parallel
2014-11-13 18:57:07 +01:00
Daniel Molkentin
7246011b62
Merge pull request #2459 from owncloud/typo
...
fix typo
2014-11-12 00:09:22 +01:00
Daniel Molkentin
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
Daniel Molkentin
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
Olivier Goffart
7b4be209aa
MOVE: fix moving with special character.
...
The Destination header need to be %-encoded
2014-11-11 16:27:06 +01:00
Olivier Goffart
c712b7c46c
Parallel MOVE by porting the job to qnam
2014-11-11 16:09:01 +01:00
Olivier Goffart
22c6892870
DELETE: Error out if the HTTP code is not 204
2014-11-11 14:32:25 +01:00
Olivier Goffart
134650eb44
Parallel DELETE
2014-11-11 13:19:29 +01:00
Olivier Goffart
506ba022f1
Split propagator_qnam.cpp into propagateupload.cpp and propagatedownload.cpp
2014-11-11 12:17:10 +01:00
Klaas Freitag
fc6d572a6c
Make compile against Qt4
2014-11-11 10:10:46 +01:00
Daniel Molkentin
b54c079766
Adjust issue urls
2014-11-09 23:38:07 +01:00
Daniel Molkentin
2db17a57d2
Fix header names
2014-11-09 23:25:57 +01:00
Daniel Molkentin
a992c5b8d3
Fix build
2014-11-09 23:10:18 +01:00
Daniel Molkentin
d57d3cf1f6
Drop Mirall from strings
2014-11-09 22:35:29 +01:00
Daniel Molkentin
ae85aa33fd
Adjust namespaces
2014-11-09 22:34:07 +01:00
Daniel Molkentin
f2eadacf09
Remove "Mirall" from class names
2014-11-09 22:30:29 +01:00
Daniel Molkentin
9ebc41ed6f
Remove "Mirall" from cmake project files
2014-11-09 22:30:05 +01:00
Olivier Goffart
98a283b4ec
Fix clang warnings
2014-11-08 11:21:48 +01:00
Olivier Goffart
d524f6b395
Fix compilation errors after merge
2014-11-08 11:11:05 +01:00
Olivier Goffart
6b716683e2
Merge the long PUT Poll URL feature with the new sql backend
2014-11-08 11:09:50 +01:00
Olivier Goffart
ba2c33af0b
Fix the il branch merge: Move the bandwidthmanager to libsync
2014-11-08 10:52:14 +01:00
Olivier Goffart
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
Volkan Gezer
260c8e0227
fix typo
2014-11-07 17:51:15 +01:00
Daniel Molkentin
f25d175b5d
Merge remote-tracking branch 'origin/1.7'
2014-11-06 19:54:20 +01:00
Klaas Freitag
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
Klaas Freitag
b9b9f3c136
Propagator: Schedule a resync immediately if file is modified during upload
2014-10-29 13:10:56 +01:00
Christian Kamm
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
Daniel Molkentin
dc1e73dcb7
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/libsync/syncjournaldb.cpp
test/CMakeLists.txt
2014-10-28 23:27:58 -04:00
Brandon Coleman
e5b03634ae
correct spelling on user is empty error.
2014-10-25 11:01:58 -05:00
Sascha Vincent Kurowski
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
Christian Kamm
c832226aa1
Merge remote-tracking branch 'origin/1.7' into master
2014-10-22 12:25:58 +02:00
Christian Kamm
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
Christian Kamm
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
Olivier Goffart
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
Klaas Freitag
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
Dominik Schmidt
89aec52503
Add checkbox to general settings to disable the crash reporter
2014-08-28 16:19:17 +02:00
Daniel Molkentin
cf12a56b4c
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/gui/socketapi.cpp
2014-08-27 18:22:07 +02:00
Dominik Schmidt
17e16f5e79
Add "Crash" entry to systray if started with --debug
2014-08-26 15:46:24 +02:00
Dominik Schmidt
b176ff6626
Don't use CMAKE_INSTALL_PREFIX for RPATH
2014-08-26 15:19:46 +02:00
Daniel Molkentin
e5471d8318
Build after merge
2014-08-26 14:33:21 +02:00
Daniel Molkentin
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
Daniel Molkentin
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
Daniel Molkentin
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
Daniel Molkentin
df3c3bca02
Split into three separate projects: library, gui and cmd
2014-07-11 11:07:31 +02:00
