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
5275238f51
Added 3rdpart QtSingleApplication class. Fixed some overall-status
...
issues.
2012-07-30 17:10:48 +03:00
64e83cb287
Added a new setup page in the ownCloud connection wizard. Also added
...
the ability for custom images and text in the setup assistant.
2012-07-25 17:51:29 +03:00
4b33997678
Check the system for inotify in cmake and use a config.h file.
2012-07-20 17:12:29 +02:00
d7fb6fa749
Fix installation on all platforms + bundle on osx
2012-07-17 15:16:02 +02:00
c3c8e512c8
Fix library build for windows, un-QOBJECTed the theme class.
2012-07-12 14:33:58 +02:00
324a9d2480
Isolate a library to add a dbus interface around.
2012-07-10 15:59:06 +02:00
689ef1254b
MacOS: Move translations to the right place
2012-06-18 15:52:56 +02:00
5ca9d5b915
Install i18n files in MacOS installer
2012-06-18 15:18:08 +02:00
926f7ce4a5
Added a window for log output.
...
Added log handlers for both the cmake logging and the mirall logging.
Push all logging to a log window with the ability to save to a file.
2012-06-05 15:11:29 +02:00
59f821f728
Make krazy2 build target optional if krazy is installed.
2012-06-04 16:44:49 +02:00
b7b617ac28
Add krazy target
2012-05-21 18:12:25 +02:00
f7e5f021c7
Fix icon install again, renaming.
2012-05-11 10:50:43 +02:00
5bc6e080de
Fix icon install.
2012-05-11 10:30:35 +02:00
d5ebf0477b
Install both application icons
2012-05-11 10:28:33 +02:00
f7fd9928b7
added a debug line without WIN32 marker.
2012-05-11 10:09:27 +02:00
cd6d3644b9
set owncloud compile flag for mac osx
2012-05-02 17:06:30 +02:00
496572314d
Fix the app icon to be ownclouds
2012-05-02 16:33:07 +02:00
125d2a4533
Make OWNCLOUD_CLIENT compile flag depending on the compile target.
2012-05-02 15:45:38 +02:00
31b636a423
Add a win32 debug line to CMakeLists
2012-04-23 10:58:21 +02:00
3f027cda73
Handle translation files correct.
2012-04-18 13:59:03 +02:00
e521d0f53c
fix check if INOTIFY flag was given on cmake command line.
2012-04-17 13:18:14 +02:00
ccac3dcf95
Make it buildable as bundle on OSX
2012-04-16 13:03:20 +02:00
508d05336b
cmake fix.
2012-04-15 18:30:31 +02:00
29a38b82ad
Replace USE_WATCHER with USE_INOTIFY
2012-04-15 14:47:43 +02:00
4a89768d02
Removed obsolete QWebdav class from CMake
2012-04-15 14:43:50 +02:00
ccd93036fb
Removed obsolete class MirallWebDav
2012-04-15 14:06:27 +02:00
b6472ce1af
Make USE_WATCHER configurable from CMake
2012-04-14 14:31:46 +02:00
f7c34ea652
Try some stuff with FindCsync.cmake
2012-04-14 04:19:52 +02:00
5ac5d6ee5f
SSL Support WIP - not yet functionable.
2012-04-06 08:53:57 +02:00
663e352956
Added an update check that queries an oC server for new versions.
2012-04-02 20:10:29 +02:00
6f49d20785
- enable WIN32 build
...
- enable cpack changes.
2012-04-02 13:47:53 +02:00
43a9d1dcd0
added app icon
2012-04-02 13:44:00 +02:00
3a36f54096
Added WIN32 switch to avoid the konsole window for production.
2012-03-28 17:26:54 +02:00
248a0cfed8
- removed the sitecopy files and last references
...
- Fix status dialog:
* display local and remote folder names
* fixed status icon
* fixed sizing when font size changes
* fixed enable/disable buttons
- moved second path to folder base class
- added remote folder role to status dellegate
2012-03-26 13:20:15 +02:00
5259ae1565
added translations of the application.
2012-03-26 09:48:30 +02:00
c6a9fb02d0
A more secure csync thread implementation (part1)
2012-03-21 18:03:49 +01:00
16a9a73ea3
- removed constants.h as not longer needed because of themes.
...
- tray icons from theme now.
2012-03-15 18:09:00 +01:00
759e2fff9d
Added missing Q_OBJECTs
2012-03-14 11:57:08 +01:00
cf4130caf9
fix more include dirs and link commands for csync.
2012-03-08 11:37:36 +01:00
660abb491d
Add install target for owncloud
2012-03-02 15:03:35 +01:00
afe6180a88
Fixed some glitches in CMakeLists.txt for Unix
2012-03-01 16:56:08 +01:00
f892212acf
Changes to build for mingw32 properly.
2012-03-01 16:10:08 +01:00
f6846a2107
Added local polling to owncloud folder, based on csync.
2012-02-28 16:49:13 +01:00
b52f9f534d
removed ownCloudDirCheck class and enhanced ownCloudInfo class to take
...
its functionality. Added defaultConnectionName() and AuthHeader to the
config file class. Fixed folderwizard to create ownCloud folder again.
2012-02-18 17:02:10 +01:00
0001b9088a
- WIP ownCloud connect wizard: added a test call to check if the
...
connect really works, better error checking
2012-02-17 15:54:39 +01:00
2c6c2625bf
WIP:
...
- split up owncloudsetup class to have a wizard class and a class that
delivers plain config data
- renamed ownCloudSetup -> ownCloudSetupWizard
- added new class MirallConfigFile
- made mirall config file (which currently only contains the owncloud
connection) multi-connection aware
- removed some sitecopy code
- removed fetch- and push slots
- adopted readFolderConfigFromFile to new file format
2012-02-17 11:11:18 +01:00
04841c940d
WIP: introduce folder manager to separate folder management from
...
GUI and ease the Application object
2012-02-17 09:48:31 +01:00
591054ed8f
introduced a theming class to build the traditional mirall client
...
as well as an ownCloud client
2012-02-16 10:42:44 +01:00
9da08610ee
Merge pull request #3 from dschmidt/master
...
fix static linking to libmirall/qwebdav
2012-02-15 05:48:13 -08:00
0c46382b6b
moved CsyncThread class to its own file
2012-02-15 09:30:37 +01:00
7e988d2e08
win32: fix static linking to libmirall/qwebdav
2012-01-19 14:10:18 +01:00
b9ce7d037f
- renamed icons to mirall instead of ownCloud
...
- install of desktop file icon added
2011-11-22 18:31:44 +01:00
b7ca0ef36a
Added install target, thanks to Dominik Schmidt <dev@dominik-schmidt.de> for the patch
2011-11-07 17:09:02 +01:00
4c002a127f
added webdav support utilizing qtwebdav-qnetworkmanager
2011-10-26 13:59:06 +02:00
9c27edc6b6
- polished the folder wizard
...
- bugfixes
- added user warnings if remote root dir is picked.
2011-10-19 11:53:12 +02:00
f4c5b9adbb
added check for the owncloud folder - WIP
2011-10-06 16:55:28 +02:00
60c304667f
added online check
2011-10-05 17:49:03 +02:00
7452f1956e
Added owncloud credentials page
2011-09-30 12:51:56 +02:00
68b966256e
WIP: OC installation wizard integration
2011-09-28 18:14:48 +02:00
292965c6a3
Wizard for owncloud configuration
2011-09-27 19:10:01 +02:00
defda477c4
status dialog work
2011-09-26 21:46:26 +02:00
627a2691ad
Statusdialog added
2011-09-26 15:00:12 +02:00
83613f4576
Add a sitecopy backend to mirall, some GUI cleanups
2011-09-26 13:12:00 +02:00
9569ff1dc6
link Qt to the static library
2011-04-08 12:03:09 +02:00
67b6e77979
handle errors to the UI
2011-04-08 11:36:53 +02:00
3ce5932bbd
g
...
Basic implementation of a CSyncFolder
Still waiting for Jann's patches for conflictcopy to hit a stable
release to make it the default.
2011-04-07 19:04:07 +02:00
65c41b6368
add simple network location infrastructure
2011-04-06 15:22:40 +02:00
f1d6352f27
working folder wizard, only actual creation of the folder pending
2011-04-05 18:31:14 +02:00
e721acd7e8
add folder wizard class
2011-04-05 11:10:44 +02:00
f42169a8fc
The unison folder class.
...
May be factor it out in a external process tool folder type later.
2011-03-21 00:58:53 +01:00
e6a135273d
- introduce a tmp dir class and rm-rf util function
...
- start a testcase for the folder watcher part
2011-03-18 01:14:45 +01:00
5294bee2bf
Infrastructure for inotify. To replace QFileSystemWatcher, which, due
...
to a Qt bug, can't see modified files.
See http://qt.gitorious.org/qt/qt/merge_requests/2301
2011-03-16 14:53:41 +01:00
b7a3fc7ab8
first port to C++
2011-02-17 00:21:45 +01:00
Daniel Molkentin