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
de79f9338a
Propagator: Bandwidth limiting for new propagator
2014-10-07 14:46:55 +02:00
2b4849a2fa
Add crash reporter using libcrashreporter-qt
2014-08-26 18:15:13 +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
4b2c1bacd1
Merge remote-tracking branch 'origin/master' into selective_sync
2014-08-15 10:28:50 +02:00
1544606bf0
Always handle 401 requests, except for network jobs
...
It is not enough to only implement it for the QNAM returned
by the ShibbolethCredentials, because we sometimes need it
when we have no valid credentials set (and are using dummy
credentials in the course). The main use case is the
Webview opened by Shibboleth for FBA.
But as a side-effect, we can use it to handle auth requests
from the updater and other places.
2014-08-12 19:25:59 +02:00
faa502163e
OS X: Finally(?) fix stay-on-top behaviour of settings dialog
...
Fixes #1795
2014-08-12 14:48:42 +02:00
1f1eb933d1
Move the update job in a new file named discoveryphase
...
"Discovery" is a better name than "update"
2014-08-11 18:42:24 +02:00
aa85e875bd
Selective sync: Add UI to select paths
2014-08-11 18:42:24 +02:00
1bc8fd9b49
CMake: Don't need translations with token auth compile
2014-08-08 11:59:14 +02:00
28879712e9
Make krazy target work again
2014-07-14 12:19:32 +02:00
5041880854
Try to handle BUILD_LIBRARIES_ONLY correctly
...
Also, try to fix OS X build
2014-07-11 12:36:01 +02:00
df3c3bca02
Split into three separate projects: library, gui and cmd
2014-07-11 11:07:31 +02:00
d1b991e198
Fix windows compilation
2014-07-10 22:58:58 +02:00
00f793a841
CMake: Remove accidentially added typo to fix build.
2014-07-10 17:20:40 +02:00
c6deb392fd
SocketAPI: Enhance SyncFileStatus to have share information.
...
Added a new class SyncFileStatus to reflect that properly.
2014-07-10 16:28:40 +02:00
b80a3876ab
cleanup the CMakeLists.txt
...
Headers need not to be added if they are not going to be installed
The list was incomplete anyway, and most of the _HEADERS variables
were even not used
2014-07-09 22:44:08 +02:00
45d1567057
Move Folder, FolderMan, and FolderWatcher outside of owncloudsync
...
Those class are maintaining the folder for the mirall configuration
They are not usefull in command line clients
Also the FolderWatcher is only used by the folder and not used by the
command line clients
2014-07-09 22:44:08 +02:00
99ee81a489
Utility: Move showInFileManager in its own file
...
And get rid of GUI in the Utility namespace
2014-07-09 22:44:08 +02:00
ba959f7cf9
CookieJar refactoring required to overcome issues in Shibboleth support
...
The shibboleth implementation no longer maintains its own QNAM.
Instead, MirallAccessManager now holds a custom QNAM implementation
which saves cookies to a file on disk.
This patch also reduces some complexity wrt the browser window,
which used to be deleted via a roundtrip to its callee, which
is not longer required.
Fixes #1764 and Enterprise bug #165
Going forward, AbstractCredentials::getQNAM() could maybe removed entirely.
2014-05-14 11:11:45 +02:00
7f7154ed40
Auto generate the Export header.
...
This should fix oem builds.
2014-04-30 13:55:40 +02:00
1338c08622
Fix compilation on linux with BUILD_LIBRARIES_ONLY
2014-04-22 11:33:38 +02:00
77ac092975
WiP: Attempt to compile without UI
2014-04-21 19:57:15 +02:00
30a14b9f45
Install ocsync library to private lib directory, use rpath to find it.
2014-04-11 13:28:11 +02:00
b34b4e37aa
Add Qt Keychain also when building with Qt5
2014-04-08 10:56:07 +02:00
d731f4718d
Add an simple SSL error handler for owncloudcmd.
2014-04-01 16:14:24 +02:00
36a2c861c2
Only build the static library when BUILD_LIBRARIES_ONLY is defined
2014-03-28 09:34:21 +01:00
d6525a979d
Do not let user change it's login while using shibbolet
...
Fixes #915
2014-03-27 17:59:50 +01:00
c41935d49d
Add a class to write a machine readable sync log file.
2014-03-26 18:16:27 +01:00
3ac1849963
Don't moc twice
2014-03-25 20:55:04 +01:00
45ec489f71
Merge branch 'master' of github.com:shadone/mirall into shadone-master
...
Conflicts:
cmake/modules/QtVersionAbstraction.cmake
src/CMakeLists.txt
src/mirall/owncloudgui.cpp
2014-03-25 19:56:45 +01:00
c841b9c0c4
Remove unused libsync_HEADERS
...
This was unused and is redudent with owncloudsync_HEADERS
2014-03-17 11:36:53 +01:00
7b482c0e96
Rename CSyncThread to SyncEngine
...
CSyncThread has not been a thread for a long time now
2014-03-17 11:34:51 +01:00
33289bde29
Merge remote-tracking branch 'origin/1.5'
...
Conflicts:
CMakeLists.txt
VERSION.cmake
src/CMakeLists.txt
2014-03-14 17:27:50 +01:00
87f3755b1f
Deploy with Qt5
2014-03-13 00:52:01 +01:00
a2467b5dea
CMake: Do options one directory above
...
This fixes linking when keychain was not desired.
2014-03-12 14:20:38 +01:00
0bbcee7354
CMake: Fix else
2014-03-11 17:56:29 +01:00
8a18cf811e
CMake: Fix warning
2014-03-11 17:33:45 +01:00
4e7e25c569
Improve libowncloudsync
...
* Introduce TokenCredentials
* Introduce static compiling
* Have compile flags for smaller compile
2014-03-11 17:05:44 +01:00
8bf2c54b56
Install include dirs app name aware.
2014-03-07 13:05:17 +01:00
e5a8cd4521
Merge branch '1.5'
...
Conflicts:
VERSION.cmake
2014-03-06 14:10:08 +01:00
33ae2eb19f
Try to handle auth requests by a Shibboleth IdP
2014-02-27 13:18:53 +01:00
869793592d
Merge branch '1.5'
...
Conflicts:
VERSION.cmake
src/mirall/owncloudpropagator.cpp
src/mirall/owncloudpropagator.h
2014-02-27 11:40:34 +01:00
45a7d4ff4c
Fix Wizard when returning from later steps
...
We need to reset the credential type when
returning to the first page from later steps.
Otherwise, unfinished credential instances
and their NAM will try to fetch data, which
will fail with weird symptoms.
2014-02-24 14:56:57 +01:00
5b561e4462
Use AUTOMOC
...
This should also fix the compilation of owncloudcmd.cpp
Since we have a Q_OBJECT in a .cpp file and qt_wrap_cpp would not generate
the moc file.
2014-02-19 11:55:08 +01:00
1be322579c
Merge remote-tracking branch 'origin/master'
...
Conflicts:
src/owncloudcmd/owncloudcmd.cpp
2014-02-19 11:19:56 +01:00
63083a558b
OwncloudCmd: Print update phase duration values
2014-02-19 10:51:04 +01:00
d4bd327fef
Merge branch 'parallel_upload'
...
Conflicts:
src/mirall/csyncthread.cpp
2014-02-19 10:24:34 +01:00
f7419094f3
move the file system helpers in their own file
2014-02-18 12:54:40 +01:00
c32beb957d
Move the jobs around between files
...
Renamed owncloudpropagator_qnam to propagator_qnam
Move the jobs in propagatorjobs.cpp
Move the neon jobs that have a qnam equivalent into propagator_legacy.cpp and
rename the jobs accordingly
2014-02-18 12:21:05 +01:00
a51cb0982b
Added Mac-specific settings dialog that looks more native
2014-02-18 02:22:16 +01:00
372f8b3426
OS X: Document how to disable the auto updater
2014-02-13 14:11:04 +01:00
a4442ebb40
Merge branch 'master' into parallel_upload
...
Conflicts:
src/mirall/owncloudpropagator.cpp
src/mirall/owncloudpropagator.h
2014-02-12 16:50:45 +01:00
ccb45bfea6
Move code from HTTPCredentials to more generic locations
...
This is a preparation to make them usable from the Shibboleth
credentials class.
2014-02-06 13:02:01 +01:00
9a6275a5e3
use QNAM for the PUT
...
Not yet supported:
- chunking
- if the file changes while uploading
- aborting
- owncloudcmd (because of the dependency to the account and the credidentials)
2014-02-06 11:50:16 +01:00
e001e70816
Sparkle: Get it working
2014-02-04 17:37:01 +01:00
c19978bdc4
Fix Qt5 jenkins build failure
2014-02-04 08:50:45 +01:00
11c368f0bc
Sparkle: Fix compilation if not found
2014-02-03 16:31:24 +01:00
4e0cf7c822
Fix win32 build
2014-01-31 09:35:43 +01:00
528d434c1f
Amendment to last commit
2014-01-30 13:07:32 +01:00
225123951d
Make compile under MacOSX
2014-01-30 11:17:14 +01:00
cb8131c382
Remove cmake message
2014-01-29 12:16:21 +01:00
1aa050bea9
Add Tests, make Updater classes into a static lib
2014-01-29 10:43:21 +01:00
1da94e5e2b
Updater: More refactoring
...
- Renamed GenericUpdater -> OCUpdater
- Make more API Private
- Split up in classes to reduce complexity:
- PassiveUpdateNotifier subclass for Linux
- NSISUpdater for Windows
2014-01-28 10:01:23 +01:00
42f5aa072d
Link against Sparkle if available
2014-01-24 11:58:11 +01:00
688d394576
Check for INotify if compiling for Linuxe and friends
2014-01-23 16:05:35 +01:00
e9e132c06c
Make use of the new linux folder watcher.
2014-01-23 13:23:27 +01:00
2370060ac5
Implement Certificate Information Widget
...
Currently used in status window. Before, there was no way to know
about the current certificate situation.
Fixes #44
2014-01-21 09:21:33 +01:00
316aade340
Merge branch 'csync_merge'
...
Conflicts:
src/CMakeLists.txt
2014-01-20 13:27:33 +01:00
6257ed6605
Make sure that the jobs have the Q_OBJECT macro.
...
so tr() works there
2014-01-16 14:06:17 +01:00
671100ce5c
Add a class ClientProxy that handles proxy setting for Qt and csync.
2014-01-16 12:52:11 +01:00
96633307c0
Move owncloudcmd into Bundle on OS X
...
Fixes #1300
2014-01-15 18:14:37 +01:00
2009fbc886
Deploy all of Sparkle manually
2014-01-15 17:52:19 +01:00
4caa038de6
More sparkle fixes
2014-01-15 16:01:35 +01:00
c7227297af
Make it compile with the merge of csync mirall
2014-01-15 12:20:03 +01:00
dc9f145a24
New Updater for Windows, passive notification on Linux, Sparkle on Mac
2014-01-15 11:09:31 +01:00
aba1252e60
Remove inotify from cmake files.
2014-01-14 15:06:06 +01:00
a12288ff21
Use folderwatcher based on Qt for Linux.
2014-01-13 11:30:27 +01:00
e5804b5d12
Use a more Qt'ish folder recursing method, remove unused class.
...
Added unit test.
2014-01-08 14:36:42 +01:00
47308cdc01
define NE_LFS from cmake
2013-12-10 16:20:49 +01:00
2cf7ba91c1
Don't install headers on OS X
2013-12-09 20:39:55 +01:00
f5e8efd435
Add build number into versioning scheme
...
This is an enabler to improve update experience
2013-12-09 16:39:13 +01:00
5f31d13236
Install headers for owncloudsync
2013-12-08 08:55:18 +01:00
f521301c51
Add plugins in install_qt4_executable to ensure the lib paths get fixed up
...
Fixes #1228
2013-12-03 13:33:50 +01:00
0fc51704f5
Enable accessibility on OS X
...
Fixes #736
2013-11-27 15:43:47 +01:00
37d6f6eeab
Build on OS X
2013-11-25 10:54:18 +01:00
5c4d240c66
Build on mac with Qt 5
...
I still had this patch on disk.
2013-11-19 14:41:40 +01:00
36e8273da0
fix mac builds
2013-11-14 20:53:56 +01:00
578431c791
Fix building owncloudcmd in case of theming
2013-11-14 14:20:09 +01:00
21c9fc2d35
Cleanup
2013-11-13 19:11:46 +01:00
22ed29a30b
Remove obsolete credentialstore class
2013-11-11 15:24:07 +01:00
64b59f8679
Don't use integration directory
2013-11-11 15:22:51 +01:00
3af622d535
Make quota display work
2013-11-05 18:15:47 +01:00
86af2848dd
Merge remote-tracking branch 'origin/master' into account_refactoring
...
Conflicts:
src/mirall/accountsettings.cpp
2013-10-30 16:37:49 +01:00
a91799a11c
Make the setup wizard compile again
...
- introduces more jobs
- needs more cleaning up
2013-10-28 20:01:59 +01:00
d2b445c80c
Basic port, misses wizard
2013-10-23 14:48:53 +02:00
38679f79b5
Need inotify on FreeBSD for libsync
2013-10-23 01:24:27 +02:00
29c846a764
WIP: Dissolve owncloudinfo class
2013-10-21 21:42:52 +02:00
a91ba0fd48
WIP: Move network tasks from ownCloudInfo into Job classes.
2013-10-18 12:24:29 +02:00
Olivier Goffart