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
a25d55a265
Add QtJson to 3rdparty, use it in ownCloudInfo
2013-10-18 02:00:19 +02:00
313832de8d
Put the progress database within the journal
2013-10-16 12:01:14 +02:00
53ac5427a8
Integrate progress dialog into settings dialog.
2013-10-09 14:27:28 +02:00
ba9ac03b0b
Put plugins in PlugIns, not Plugins on Mac
...
Requires 770539f0a5
2013-10-04 13:01:46 +02:00
0257f7e169
Add sqlite plugin for OS X
2013-10-04 13:01:46 +02:00
8ed2588cdf
Fix build with Qt5
2013-10-03 23:14:10 +02:00
e304dfd5b9
Add socketapi
...
Slightly amended by: Daniel Molkentin <danimo@owncloud.com>
2013-10-03 17:05:01 +02:00
59bf8740a0
Add c_jhash.h header from csync to 3rdparty.
2013-10-03 16:41:23 +02:00
21cd57228e
Fix build with Qt5
...
Missing SQL module
2013-10-03 16:29:47 +02:00
c32bc27b3e
Add sync journal database class that opens the csync db to read from it.
2013-10-03 15:29:10 +02:00
ea1c951006
Refactoring: Moved all GUI related computing out of application class.
...
Created ownCloudGui class to contain all gui related stuff.
2013-10-01 13:58:01 +02:00
e250672e4a
CMake: libhttplib -> httplib
2013-09-30 23:16:04 +02:00
27b9a5aed9
Merge branch '1.4', brings in the changes we did for 1.4.1
2013-09-24 14:18:25 +02:00
7048bd8cc9
Handle app icon names properly.
2013-09-24 12:19:29 +02:00
363efaa408
Theming build fix: Icons need shortname
2013-09-20 23:09:41 +02:00
927f7549d4
Revert "Compile (find httpbf)"
...
This reverts commit 2d2e843804
2013-09-11 09:00:27 +02:00
2d2e843804
Compile (find httpbf)
2013-09-11 08:11:03 +02:00
3577ba2981
Fix httpbf/neon linkage
2013-09-10 19:50:44 +02:00
48b4c57d92
Use shared version of libhttpbf, package it on win
2013-09-10 14:45:08 +02:00
6b9950a9a0
Qt5: DBUS is only needed for FDO
2013-09-05 18:41:49 +02:00
35ac6610c7
Compile with Qt5 on Linux
2013-09-05 17:13:31 +02:00
8fe102662d
Merge branch 'propagator-ng': Fixes to work with new LGPL ocsync.
...
Conflicts:
src/mirall/csyncthread.cpp
2013-09-04 16:33:06 +02:00
bf6d0a521c
Compile with Qt5
2013-08-28 20:58:22 +02:00
73da086964
Initial changes to also build on Qt5, doesn't compile yet
2013-08-28 17:03:31 +02:00
b97701586e
Properly install icons
2013-08-26 21:18:56 +02:00
ec5c65a530
install correct file
2013-08-26 20:35:56 +02:00
24d76a0d75
desktop file == executable
2013-08-26 20:20:10 +02:00
9f89a2fe76
More adjustments around the application name
...
- libname is now derived from binary name (which is lowercase)
- remove superflouos reimplementation of appName() in owncloud theme
- APPLICATION_SHORTNAME is now optional (and if not set, equals
APPLICATION_NAME
2013-08-23 10:30:03 +02:00
42abf4101c
Honor cmake's install prefix
...
since the entire ting is so incredibly broken in cmake,
use the approach taken by csync (which emulates the
approach of autotools), to get the directories right.
This mandates changes in the theme, which need discussion
(APPLICATION_SHORTNAME must now equal appName(), and
APPLICATION_NAME should equal appGuiName()).
2013-08-22 09:40:25 +02:00
0589bfc51b
Merge branch 'master' into propagator-ng
...
This just fix the conflict.
Do not compile or work yet
Conflicts:
src/CMakeLists.txt
src/mirall/csyncthread.cpp
src/mirall/csyncthread.h
src/mirall/owncloudfolder.cpp
src/mirall/syncfileitem.h
test/CMakeLists.txt
2013-08-14 15:19:21 +02:00
32b44e3d87
Removed unused dialog class.
2013-08-14 08:04:46 +02:00
a875b46a80
Add cookie handling for Shibboleth credentials.
...
Which cookies are going to be stored are determined only when setting
up or modifying an account. Cookie handling allow us to avoid choosing
Identity Provider everytime when browser page appears.
2013-08-07 15:03:13 +02:00
002142539b
Remove most of the dead code in Shibboleth setup page.
...
The effect of most of the code wasn't even visible after making a
browser an independent window.
2013-08-06 14:56:26 +02:00
577bc546d8
Handle SSL problems also for Shibboleth servers.
2013-08-06 11:56:27 +02:00
0932ee6051
Merge branch 'shibboleth'
...
Conflicts:
src/CMakeLists.txt
src/mirall/application.h
2013-08-05 19:54:06 +02:00
f0b284eda7
Refresh Shibboleth cookie if it gets outdated during sync.
2013-08-05 17:42:03 +02:00
a25d9fd3b4
Added itemprogressdialog class to show the sync progress and problems.
2013-08-01 16:58:36 +02:00
f6e3838eb2
Create a QNetworkAccessManager subclass which sets proper user agent and use it.
2013-08-01 16:53:43 +02:00
50edac8ee8
Split setup page into server and advanced parts.
2013-08-01 16:53:43 +02:00
78b6f4df01
Move the creds/ and wizard/ directories one level higher.
2013-08-01 16:53:43 +02:00
d5885daf0f
Move credential related files to creds directory.
...
CredentialStore is now only used for HTTP credentials, so it was moved
into http directory under creds.
2013-08-01 16:53:43 +02:00
367bc401ee
Add Shibboleth credentials implementation.
2013-08-01 16:53:43 +02:00
92af3ea725
Add and use credentials abstraction. Implement HTTP and dummy credentials.
...
To achieve that MirallConfigFile now exports several general
settings-related methods for subclasses (here: for HttpConfigFile), so
it does not have to contain any code targeted for specific
credentials.
2013-08-01 16:53:43 +02:00
582ce4cfa0
Cleanup setup wizard. Split setup page into two.
...
First page is for giving server URL and advanced setup and second page
is for giving credentials. Second page will differ based on
authentication type supported by ownCloud server. For now only HTTP
credentials are supported.
2013-08-01 16:53:43 +02:00
f1878640c8
Linux: install all available icon sizes
2013-07-27 13:06:38 +02:00
bca295183b
Make use of bandwidth limiting, split general/network settings.
...
Fixes #14
2013-07-24 19:53:20 +02:00
56e5627b6b
ownCloudFolder -> Folder
...
Fixes #769
2013-07-22 20:30:38 +02:00
6b5b9db20a
Handle progress through ProgressDispatcher class, WIP.
2013-07-11 12:32:58 +02:00
024d01a192
Cleanly install themed clients next to owncloud on Unix
...
- Renames libowncloudsync for themes
- Properly names i18n dir
2013-07-08 01:44:49 +02:00
751d7deda6
Utility: Compile on Windows again
...
Theme moc files belong with libowncloud
2013-07-06 22:42:02 +02:00
c6219581f6
More work on ignore/exclude files:
...
- Introduce split between sytem and user files
- Add Editor
Current limitation: Picking up the changes requires
a restart
2013-07-05 16:54:11 +02:00
c164beb040
Commit squashed refactoring branch
...
- introduce settings dialog
- general settings for general / proxy settings
- standalone proxy settings dialog removed
- standalone status dialog removed
- moved status dialog into settings dialog
- radically cut down links in context menu
- add help link to context menu
This needs more cleanup and testing. Known issues:
- When the wizard is called while the settings dialog
is open, it will not show old information (see FIXME)
- Some settings are not implemented yet (greyed out)
- The counter in the FileItemDialog is not correct the
first time around.
Based on the discussion done with Jan and Klaas during the
Nuenberg workshop.
2013-07-04 20:02:44 +02:00
d35e1baee1
Remove obsolete code
2013-06-26 17:27:44 +02:00
d4ea0ba6ba
Merge branch 'master' of git://github.com/gnumdk/mirall
...
Conflicts:
CMakeLists.txt
As per PR 457
2013-05-20 16:54:49 +02:00
3a50eece9e
More theming refactoring
2013-05-17 20:56:17 +02:00
c210e2b72f
Remove obsolete miralltheme
2013-05-17 20:11:16 +02:00
0636ae6f28
propagator-ng: be able to resume download
2013-05-06 16:59:11 +02:00
72580d7213
move command line client into bin dir
2013-05-04 17:14:47 +02:00
a36d79e993
Fix make install
2013-05-04 17:01:14 +02:00
90d0460a42
Remove dummy artwork, dead switches
2013-05-04 15:55:04 +02:00
b51f210bfa
Drop (broken) mirall binary
...
This remove all non-ownCloud backends, as well
as all obsolete wizard pages. CSync is now
a mandatory dependency.
2013-05-04 14:03:51 +02:00
f6ff189f35
Add owncloudcmd
...
A simple commandline client like ocsync.
The goal is to be used bu the t1.pl test
2013-05-04 13:52:35 +02:00
e1e8842548
New owncloud propagator that skip the vio abstraction layer
...
The vio abstraction layer within csync is inneficient for the owncloud
use case because not all calls maps well to the POSIX interface. We can
be much more efficient by doing exactly what we need.
Also, this will allow us to scedule better the calls and possibly to use
threads.
2013-05-04 11:02:30 +02:00
238111be09
Find csync_version.h, local config.h
2013-04-26 10:48:02 +02:00
6f0820a3ed
Add QProgressIndicator to source list
2013-04-26 10:47:17 +02:00
311bd39100
Add simplified FancyLineEdit from Qt Creator to 3rdparty
2013-04-24 13:36:25 +02:00
fab77a15f0
Fix build after merge
2013-04-24 13:33:26 +02:00
c5a674b1df
More work on new Connection dialog. First working version.
2013-04-24 11:40:29 +02:00
cd7d2a0778
Set path for configure_file of desktop file.
2013-04-17 16:21:05 +02:00
c03199e78a
Re add space
2013-03-22 11:35:25 +01:00
f346503534
Better fdo detection
2013-03-22 11:34:21 +01:00
2f0474a467
Add support for freedesktop notifications
2013-03-20 10:03:49 +01:00
3cf7003101
Load UI languages instead of locales where possible
...
Load Qt translations consistently along the way.
This only has been verified on mac and needs adoption
for win32.
2013-02-21 13:19:54 +01:00
2ba20369ea
Remove unused gitfolder class for now
2013-02-14 17:36:11 +01:00
d358c839ce
Fixed typos.
2013-02-09 12:46:08 +01:00
cfa777260c
removing version for mirallsync (it is'nt build anymore :)
2013-02-08 18:37:29 +01:00
66fc273db6
merging with default
2013-02-08 18:36:26 +01:00
dbb0cbaff8
Removed build of obsolete mirallsync lib which is equal to owncloudsync.
2013-02-08 19:18:36 +01:00
9c9e377cf4
adding soname version to libowncloudsync and libmirallsync
2013-02-08 18:21:59 +01:00
cece465947
Link libdl explicitely.
2013-02-06 10:09:02 +02:00
9af862b455
Fix make install, clean up
2013-01-18 22:15:08 +01:00
bc3938daa7
A new sync file protocol dialog.
2013-01-15 20:42:09 +01:00
11dbacab60
Exclude desktop file handling for windows platform.
2013-01-14 12:13:50 +01:00
5c495265f4
Consolidate theming support.
...
This implements out-of-repository-theming, and removes the old
custom.ini theming that never worked on all platforms and had
no straight deployment story.
The new approach requires the CMAKE variable OEM_THEME_DIR to
point to a directory that must at least contain an OEM.cmake file
(check OWNCLOUD.cmake for possible options) as well as a themes.qrc
and a themes/ directory that directly correspond to the ones in
the source tree.
2013-01-10 17:16:59 +01:00
26c01cefa7
New icons for ownCloud client
...
--monoicons shows platform-specific monochrome icons
for now until we have a proper settings dialog.
2012-12-20 16:41:54 +01:00
30494eee75
Added utility class with format fingerprint method.
...
Removed other obsolete formatting method.
2012-12-13 21:36:44 +01:00
ddecca47fd
osx/win: add sync folders to favorite folders
2012-12-07 19:51:11 +01:00
4ef89abac7
Compile on Mac
2012-12-06 18:48:36 +01:00
d50d4d1a6f
Add windows backend, require Inotify on Linux
...
Dummy-backend yanked for now, no support for other Unixes...
2012-12-06 17:53:04 +01:00
36c9a29a7b
Move Logger into its own file, move it to libsync.
...
This fixes a linker error.
2012-12-05 16:45:28 +01:00
2b2eb853fc
Add qtkeychain to cmake - WIP read password from keychain.
...
Conflicts:
CMakeLists.txt
2012-11-27 19:28:03 +01:00
a8dbed989b
Use CredentialStore to manage user credentials.
...
This fixes the bug that if the password is not stored in the cfg
file the user could not cancel the auth dialog. Moreover it handles
various credential backends better and gives a better user experience.
2012-11-13 11:19:34 +01:00
fee9616708
OS X: Remove "make install" requirment for csync
2012-10-10 16:05:17 +02:00
ae93e2aa10
Fix OS X bundle generation
2012-10-05 11:59:50 +02:00
7d52884699
Fix cmake for windows wrt libocsync renaming
2012-10-05 12:10:33 +04:00
c42f77cf23
Consistency fix: name ui and src alike
2012-10-03 00:45:54 +02:00
9ce10e7fe7
removed wrong header from filelist.
2012-10-02 13:18:36 +02:00
663a1886e9
CMake: Centralize all application-specific parameters.
2012-09-20 17:31:18 +02:00
094f791400
Removed unused file temporarydir.
2012-08-17 17:55:15 +03:00
bfb99d2078
Qt part of proxy support - contributed by Thomas Mueller.
2012-07-31 11:17:52 +03:00
Olivier Goffart