Markus Goetz
|
6e0330ff65
|
SyncEngine: Error out if we don't have a sync dir
|
2014-08-28 11:47:40 +02:00 |
|
Markus Goetz
|
3aa7178382
|
PollJob: Increase timeout
|
2014-08-28 11:27:08 +02:00 |
|
Dominik Schmidt
|
439bf7641e
|
Use include path for libcrashreporter-qt instead of lengthy relative include
|
2014-08-28 11:11:42 +02:00 |
|
Dominik Schmidt
|
34042028b3
|
Add CRASHREPORTER_SUBMIT_URL define and default it to some placeholder owncloud url
|
2014-08-28 11:05:46 +02:00 |
|
Markus Goetz
|
d69049ce10
|
OS X: Fix Finder plugin
|
2014-08-28 10:21:56 +02:00 |
|
Jenkins for ownCloud
|
44a281534d
|
[tx-robot] updated from transifex
|
2014-08-28 01:25:30 -04:00 |
|
Daniel Molkentin
|
59a9cc7c12
|
OS X build: use correct macro for version number
|
2014-08-28 00:08:24 +02:00 |
|
Markus Goetz
|
2f34b046d0
|
Overlay Icons: Improve OS X version, improve general feedback
Now the update phase of the syncing algorithm pushes stuff the notification socket too.
|
2014-08-27 19:15:43 +02:00 |
|
Olivier Goffart
|
a73316306d
|
Selective sync: new design in the wizard
|
2014-08-27 19:03:11 +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 |
|
Olivier Goffart
|
928652e4cf
|
Selective sync: rename the button 'choose what to sync'
|
2014-08-27 17:31:57 +02:00 |
|
Olivier Goffart
|
7950b49cb1
|
Selective sync dialog: fix fetching sub directory when the folder is not the root folder
|
2014-08-27 17:19:36 +02:00 |
|
Markus Goetz
|
f8b1b243c1
|
OS X: Fix installer target name if we have a build number
|
2014-08-27 14:44:21 +02:00 |
|
Klaas Freitag
|
cc6aa66ab0
|
JournalDB: Do prepare the queries even if the db update failed.
Also, add more logging in case SQL errors happen while db structure
update.
|
2014-08-27 14:01:33 +02:00 |
|
Olivier Goffart
|
ea381392a7
|
SocketAPI: fix the BROADCAST message
|
2014-08-27 13:55:06 +02:00 |
|
Olivier Goffart
|
bb7f63dcfd
|
AccountSettings: be less verbose in the status string
|
2014-08-27 13:51:14 +02:00 |
|
Olivier Goffart
|
253d65727b
|
Socket api: Add a VERSION command
|
2014-08-27 13:51:14 +02:00 |
|
Markus Goetz
|
61138b58bf
|
OS X: Quote the installer filename
Viel hilft viel
|
2014-08-27 12:49:22 +02:00 |
|
Markus Goetz
|
5490063b7e
|
OS X: Fix installer creation
The script should know independently of the machine
|
2014-08-27 12:02:57 +02:00 |
|
Klaas Freitag
|
d2e1489fe7
|
Propagator: Set the chunk size to 20MB as requested by Matt.
|
2014-08-27 10:35:58 +02:00 |
|
Daniel Molkentin
|
2c6324e3e5
|
Fix tests
|
2014-08-27 10:27:29 +02:00 |
|
Jenkins for ownCloud
|
e442ba863a
|
[tx-robot] updated from transifex
|
2014-08-27 01:25:26 -04:00 |
|
Dominik Schmidt
|
2b4849a2fa
|
Add crash reporter using libcrashreporter-qt
|
2014-08-26 18:15:13 +02:00 |
|
Klaas Freitag
|
eb898646bc
|
Create Mac Pack: Copy the creator script to the build directory.
|
2014-08-26 18:13:43 +02:00 |
|
Markus Goetz
|
79b547b83b
|
Icon Overlay OS X: Complain if icon couldnt be loaded
|
2014-08-26 17:21:15 +02:00 |
|
Olivier Goffart
|
2356601bb3
|
folder: Make sure not to pol the server if the account is disconnected
Fixes #2108
|
2014-08-26 16:23:19 +02:00 |
|
Olivier Goffart
|
9b88c7d3c1
|
SSLButton: fix memleak
|
2014-08-26 15:59:19 +02:00 |
|
Olivier Goffart
|
302499b483
|
uploading: make sure to cast to uint64 to avoid integer overflow
|
2014-08-26 15:58:55 +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 |
|
Jenkins for ownCloud
|
03dc27a327
|
[tx-robot] updated from transifex
|
2014-08-26 01:25:22 -04:00 |
|
Jenkins for ownCloud
|
9291ace558
|
[tx-robot] updated from transifex
|
2014-08-25 01:25:17 -04:00 |
|
Jenkins for ownCloud
|
15c11ea172
|
[tx-robot] updated from transifex
|
2014-08-24 02:06:11 -04:00 |
|
Jenkins for ownCloud
|
cd6950d984
|
[tx-robot] updated from transifex
|
2014-08-24 01:25:18 -04:00 |
|
Jenkins for ownCloud
|
de96350bee
|
[tx-robot] updated from transifex
|
2014-08-23 01:25:22 -04:00 |
|
Markus Goetz
|
b037e6356e
|
TokenCredentials, DirectDownload: Rework cookie handling
That way we don't override QNAM's cookie jar behaviour
|
2014-08-22 13:46:22 +02:00 |
|
Markus Goetz
|
824628061b
|
Propagator: Don't have cookies overriden by QNetworkCookieJar
The direct download feature has its own cookies, don't let QNAM override them.
|
2014-08-22 12:12:46 +02:00 |
|
Jenkins for ownCloud
|
a9f1e165b5
|
[tx-robot] updated from transifex
|
2014-08-22 01:25:19 -04:00 |
|
Daniel Molkentin
|
c60b433c42
|
create shellext path
|
2014-08-21 20:33:25 +02:00 |
|
Daniel Molkentin
|
933c7e36d1
|
NSIS: fix target path for shell extension
|
2014-08-21 17:33:22 +02:00 |
|
Markus Goetz
|
449abace66
|
CSync: Ignore OS X files with hidden flag
|
2014-08-21 16:43:24 +02:00 |
|
Klaas Freitag
|
6025b3a91b
|
Bump version to beta1
|
2014-08-21 14:33:03 +02:00 |
|
Klaas Freitag
|
c473428be6
|
Merge pull request #2084 from owncloud/contextless_exclude
Contextless exclude, @ogoffart reviewed, I'll merge.
|
2014-08-21 13:15:18 +02:00 |
|
Klaas Freitag
|
e06e5fe55f
|
Excludes: Fix unit tests for the new exclude load interface.
Also removed some commented lines.
|
2014-08-21 13:12:05 +02:00 |
|
Klaas Freitag
|
dc8f437b31
|
Excludes: Add an context free implementation of exclude file loading.
So that we are more thread safe.
|
2014-08-21 12:43:04 +02:00 |
|
Daniel Molkentin
|
2219d409a4
|
Update binary submodule
|
2014-08-21 11:48:59 +02:00 |
|
Olivier Goffart
|
aabcf80774
|
Sync engine: Take also in account the fact that the instruction can be IGNORE on both tree
|
2014-08-21 11:33:38 +02:00 |
|
Olivier Goffart
|
1cf956ec21
|
Discovery phase: clear the callbacks after use
|
2014-08-21 11:27:25 +02:00 |
|