Klaas Freitag
|
7701805dc4
|
Add a warning window for/against usage of old server versions.
|
2012-08-30 18:52:50 +03:00 |
|
Klaas Freitag
|
824bd1e087
|
Fix memory allocation for proxy struct in thread.
|
2012-08-30 18:50:42 +03:00 |
|
Klaas Freitag
|
f78f3e0869
|
Set beta tag to application version. Not a pretty solution.
|
2012-08-30 18:48:32 +03:00 |
|
Klaas Freitag
|
094d563dbb
|
Set sslCertsTrust to defined value at start.
|
2012-08-30 14:02:42 +03:00 |
|
Klaas Freitag
|
cb6b3e1d85
|
Setup connections to ocinfo when needed.
|
2012-08-30 14:02:15 +03:00 |
|
Klaas Freitag
|
72e14b3688
|
Use the remote.php/webdav url rather than files/webdav.php
|
2012-08-30 13:23:14 +03:00 |
|
Klaas Freitag
|
a723a968ba
|
allow custom media at relative path for windows.
|
2012-08-27 19:09:56 +03:00 |
|
Klaas Freitag
|
f4bb981ad4
|
add application path back to translation laoding.
|
2012-08-27 18:59:31 +03:00 |
|
Klaas Freitag
|
ced6f0ed96
|
Fix compile problem.
|
2012-08-26 16:10:17 +02:00 |
|
Klaas Freitag
|
fd7cb38c16
|
Use qthread more correct, see
http://labs.qt.nokia.com/2006/12/04/threading-without-the-headache/
|
2012-08-26 11:47:45 +02:00 |
|
Klaas Freitag
|
a459f468a3
|
Use PlainTextEdit widget for more efficient log file display.
|
2012-08-26 11:46:59 +02:00 |
|
Klaas Freitag
|
5294f446a2
|
Merge branch 'master' of gitorious.org:owncloud/mirall
Conflicts:
src/mirall/owncloudinfo.cpp
src/mirall/owncloudsetupwizard.cpp
src/mirall/owncloudwizard.cpp
|
2012-08-24 11:16:58 +02:00 |
|
Klaas Freitag
|
d733aac0e8
|
Fix QLatin1String issues.
|
2012-08-17 18:13:17 +03:00 |
|
Klaas Freitag
|
a8296a6b6e
|
Removed unneeded win32 headers.
|
2012-08-17 18:00:03 +03:00 |
|
Klaas Freitag
|
094f791400
|
Removed unused file temporarydir.
|
2012-08-17 17:55:15 +03:00 |
|
Klaas Freitag
|
58d75e7bfe
|
Show pathes in platform specific notation
|
2012-08-15 18:16:44 +03:00 |
|
Klaas Freitag
|
1b7ad22e2e
|
Fix setup dialog: Use https if checkbox is activated.
|
2012-08-14 13:23:06 +03:00 |
|
Klaas Freitag
|
74c6c4e7c9
|
cleanups and improved error messaging on proxy problems.
|
2012-08-09 15:13:20 +03:00 |
|
Klaas Freitag
|
9e30fe4ea5
|
Do not stop syncing if local directories are write protected.
|
2012-08-09 12:12:54 +03:00 |
|
Klaas Freitag
|
d743f7f4b3
|
Fixed and cleaned redirect bug, make sync work again.
|
2012-08-08 23:11:07 +03:00 |
|
Klaas Freitag
|
8117b9802b
|
Connect ocInfo only if needed in ownCloud setup wizard.
|
2012-08-08 16:52:12 +03:00 |
|
Klaas Freitag
|
08d925a8fa
|
read proxy setting from cfg file rather than from Qt proxy object.
|
2012-08-08 16:48:21 +03:00 |
|
Klaas Freitag
|
58ca49c8bd
|
QLatin1String fix.
|
2012-08-08 16:47:56 +03:00 |
|
Klaas Freitag
|
aeb0499833
|
read proxy settings from config file rather than from Qt proxy obj.
|
2012-08-08 16:47:25 +03:00 |
|
Klaas Freitag
|
80f2699c80
|
handle proxy port correctly.
|
2012-08-06 17:44:23 +03:00 |
|
Klaas Freitag
|
70838442c9
|
Fixed error handling on remote dir create.
|
2012-08-06 17:43:24 +03:00 |
|
Klaas Freitag
|
d694525d8f
|
Simplify loading of the exclude file on various platforms.
|
2012-08-06 16:13:35 +03:00 |
|
Klaas Freitag
|
c916f5cbd9
|
connect owncloudinfo signals more selective.
|
2012-08-06 15:00:22 +03:00 |
|
Klaas Freitag
|
83bda2c8d5
|
handle HTTP status 301 -> redirect.
|
2012-08-06 14:59:59 +03:00 |
|
Klaas Freitag
|
a00086759e
|
connect the owncloudinfo signals more selective.
|
2012-08-06 14:59:18 +03:00 |
|
Klaas Freitag
|
4b869cfb10
|
do not write CA Certs on its own, use methods in mirallconfigfile.
|
2012-08-06 14:58:24 +03:00 |
|
Klaas Freitag
|
f5717348f8
|
QLatin1String fix
|
2012-08-06 14:58:11 +03:00 |
|
Klaas Freitag
|
4cad29331f
|
- set ownCloudUrl and known CA Certs.
|
2012-08-06 14:57:26 +03:00 |
|
Klaas Freitag
|
84a588ccf0
|
Fix signal connection and initialize the dialog pointer to zero.
|
2012-08-06 11:13:26 +03:00 |
|
Klaas Freitag
|
2c2fe38ad0
|
Fix app name back to "ownCloud" to load existing configs again.
|
2012-08-03 15:03:57 +03:00 |
|
Klaas Freitag
|
bdb35f508a
|
QLatin1String fixes all over.
|
2012-08-02 12:17:24 +03:00 |
|
Klaas Freitag
|
35e92030f8
|
Fix size of dialog.
|
2012-08-02 12:16:18 +03:00 |
|
Klaas Freitag
|
9fe003df78
|
Restructured the tray context menu.
|
2012-08-02 12:15:57 +03:00 |
|
Klaas Freitag
|
ba856bf2d4
|
Fix proper placeholding patches in oC connection wizard.
|
2012-08-02 12:11:02 +03:00 |
|
Klaas Freitag
|
d867cfacb4
|
Some translation changes.
|
2012-08-02 12:09:37 +03:00 |
|
Klaas Freitag
|
eecb444772
|
Replace some delete calls with QObject parenting.
|
2012-08-02 12:08:27 +03:00 |
|
Klaas Freitag
|
42283e4684
|
Some code cleanups for the proxy dialog.
|
2012-08-02 12:07:14 +03:00 |
|
Klaas Freitag
|
343f646660
|
Fix load self signed certs into NetworkManager (#oc-843)
|
2012-08-02 12:02:46 +03:00 |
|
Klaas Freitag
|
d3bb223898
|
Proceed proxy settings to csync thread.
|
2012-08-02 11:17:15 +03:00 |
|
Daniel Molkentin
|
62d1f281c3
|
Fix SSL support in ownCloud wizard
- honor secure connect option
- fix connects in ctor of singleton
- don't crash
|
2012-08-01 18:33:19 +02:00 |
|
Thomas Mueller
|
eb2d93de38
|
read proxy settings from config on dialog startup
|
2012-07-31 11:03:52 +02:00 |
|
Thomas Mueller
|
e4da16b9d6
|
support Qt 4.6
|
2012-07-31 10:43:38 +02:00 |
|
Klaas Freitag
|
5bde3262d6
|
Merge branch 'master' of gitorious.org:owncloud/mirall
|
2012-07-31 11:18:43 +03:00 |
|
Klaas Freitag
|
bfb99d2078
|
Qt part of proxy support - contributed by Thomas Mueller.
|
2012-07-31 11:17:52 +03:00 |
|
Dominik Schmidt
|
8fef939a1a
|
Extend wizard raising hack to OS X.
|
2012-07-31 01:57:02 +02:00 |
|
Klaas Freitag
|
5275238f51
|
Added 3rdpart QtSingleApplication class. Fixed some overall-status
issues.
|
2012-07-30 17:10:48 +03:00 |
|
Klaas Freitag
|
ae847e46e7
|
Added support method statusToString
|
2012-07-30 17:09:49 +03:00 |
|
Klaas Freitag
|
1ff94e86bd
|
Fix build with UNICODE under windows, fix USE_INOTIFY initialization.
|
2012-07-30 17:08:42 +03:00 |
|
Klaas Freitag
|
90c4e422d8
|
Merge commit 'refs/merge-requests/7' of git://gitorious.org/owncloud/mirall into merge-requests/7
|
2012-07-26 11:45:30 +03:00 |
|
Klaas Freitag
|
0112bb1e05
|
Merge branch 'master' of gitorious.org:owncloud/mirall
|
2012-07-26 11:40:06 +03:00 |
|
Klaas Freitag
|
b7993a43fd
|
Removed Log Window Button
|
2012-07-26 11:38:14 +03:00 |
|
Klaas Freitag
|
b2580b4b0e
|
Merge branch 'master' of gitorious.org:owncloud/mirall
|
2012-07-26 10:16:59 +02:00 |
|
Klaas Freitag
|
e3f83f4bda
|
converted ownCloudInfo to Singleton pattern to fix crashes.
|
2012-07-26 10:16:18 +02:00 |
|
Klaas Freitag
|
66d70c0835
|
More custom media for the connect dialog.
|
2012-07-26 11:01:43 +03:00 |
|
Klaas Freitag
|
0c89dd9555
|
Store GUI customizations at system place.
|
2012-07-25 18:47:31 +03:00 |
|
Klaas Freitag
|
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 |
|
Klaas Freitag
|
37359969e4
|
Fix for bug #oc-1318, crash through accessing zero pointer.
|
2012-07-25 16:00:18 +03:00 |
|
Klaas Freitag
|
4ef948bf3c
|
Use a better inotify implementation and use config.h. Fixes oCB #713.
|
2012-07-20 17:13:23 +02:00 |
|
Klaas Freitag
|
4b33997678
|
Check the system for inotify in cmake and use a config.h file.
|
2012-07-20 17:12:29 +02:00 |
|
Klaas Freitag
|
2433b35727
|
Merge branch 'mirall-kde'
|
2012-07-20 11:56:50 +02:00 |
|
Klaas Freitag
|
75835c45a3
|
emit folderChange after initial setup.
|
2012-07-20 11:37:54 +02:00 |
|
Klaas Freitag
|
d225dd124b
|
Fixed icon setup. Theme now really supports icons in various sizes.
|
2012-07-18 17:29:06 +02:00 |
|
Klaas Freitag
|
3244a922e3
|
fixed overall sync state calculation for tray .
|
2012-07-18 17:28:30 +02:00 |
|
Dominik Schmidt
|
d7fb6fa749
|
Fix installation on all platforms + bundle on osx
|
2012-07-17 15:16:02 +02:00 |
|
Michael Georg Hansen
|
9c64b5e753
|
Add a clear button to the log window.
|
2012-07-16 21:11:19 +02:00 |
|
Klaas Freitag
|
c3c8e512c8
|
Fix library build for windows, un-QOBJECTed the theme class.
|
2012-07-12 14:33:58 +02:00 |
|
Klaas Freitag
|
973c2c1786
|
remove the push atomar method call for csync.
|
2012-07-10 16:21:51 +02:00 |
|
Klaas Freitag
|
324a9d2480
|
Isolate a library to add a dbus interface around.
|
2012-07-10 15:59:06 +02:00 |
|
Klaas Freitag
|
dd4f76c5c7
|
replace URL by Link in user string
|
2012-07-02 11:03:41 +02:00 |
|
Klaas Freitag
|
40a3b1e4e8
|
Use absolute path function for directory comparison
|
2012-06-26 12:27:50 +02:00 |
|
Klaas Freitag
|
c8ac719752
|
Remove csync db in case the local path gets removed.
|
2012-06-25 15:31:13 +02:00 |
|
Klaas Freitag
|
928ef731c9
|
Better protection against remote folder delete.
|
2012-06-25 14:18:13 +02:00 |
|
Klaas Freitag
|
0e418b2f68
|
Fix a missing delete.
|
2012-06-22 15:36:04 +02:00 |
|
Klaas Freitag
|
6ad89d98a9
|
- Add csync push atomar switch
- Fix a wording if the directory does not exist.
|
2012-06-22 15:35:22 +02:00 |
|
Klaas Freitag
|
34cf97a827
|
Also clear error list in folders for the inotify case.
|
2012-06-20 12:52:21 +02:00 |
|
Klaas Freitag
|
bccb17ce41
|
Clear error list on start of non local sync.
|
2012-06-20 12:50:46 +02:00 |
|
Klaas Freitag
|
5e2729ddef
|
Fix a typo in ssl dialog
|
2012-06-18 18:27:06 +02:00 |
|
Klaas Freitag
|
5d0aada871
|
Fix translations loading under win32
|
2012-06-18 17:45:04 +02:00 |
|
Klaas Freitag
|
689ef1254b
|
MacOS: Move translations to the right place
|
2012-06-18 15:52:56 +02:00 |
|
Klaas Freitag
|
cb99ccf75d
|
Load translations correctly.
|
2012-06-18 15:50:17 +02:00 |
|
Klaas Freitag
|
5ca9d5b915
|
Install i18n files in MacOS installer
|
2012-06-18 15:18:08 +02:00 |
|
Klaas Freitag
|
8384fe477a
|
Simplified LogBrowser
|
2012-06-18 14:51:49 +02:00 |
|
Klaas Freitag
|
8fe20369af
|
Some more usefull debug output
|
2012-06-18 10:42:30 +02:00 |
|
Klaas Freitag
|
9901d3a736
|
Added --help option with output
|
2012-06-15 13:36:38 +02:00 |
|
Klaas Freitag
|
c90eb1cca6
|
Log to file added, with flush option
|
2012-06-15 13:04:23 +02:00 |
|
Klaas Freitag
|
4d1fed3d00
|
Rejecting the SSL dialog means untrusting.
|
2012-06-15 11:18:16 +02:00 |
|
Klaas Freitag
|
4807c355e5
|
Fixed wording in setup assistant
|
2012-06-15 10:58:15 +02:00 |
|
Klaas Freitag
|
ce50043524
|
Improved some grammar based on Matts proposals.
|
2012-06-15 10:51:51 +02:00 |
|
Klaas Freitag
|
36ad4fdc83
|
More encoding fixes to make win32 with special chars work.
|
2012-06-13 17:34:20 +02:00 |
|
Klaas Freitag
|
a39fb310e1
|
use UTF-8 encoding in the settings file.
|
2012-06-13 17:33:48 +02:00 |
|
Klaas Freitag
|
d5d0c472ed
|
store the custom config for each reply object.
|
2012-06-13 11:37:20 +02:00 |
|
Klaas Freitag
|
f0bae07a2c
|
make ssldialog aware of custom configs.
|
2012-06-13 11:36:56 +02:00 |
|
Klaas Freitag
|
5953d36297
|
Fixed removeAllFolders: Terminate running syncs before removal.
|
2012-06-13 11:30:26 +02:00 |
|
Klaas Freitag
|
2dcbb54095
|
Use UTF8 to read password and username rather than local8bit.
|
2012-06-13 11:29:38 +02:00 |
|
Klaas Freitag
|
6d8956f68a
|
Make setup wizard really cancel if user clicks cancel and accept
only if the user finally accepts the dialog.
Remove all sync folder definitions if a new oC connection was done.
|
2012-06-12 12:30:05 +02:00 |
|
Klaas Freitag
|
f219b0613c
|
Added method to drop all sync folder definitions.
|
2012-06-12 12:29:39 +02:00 |
|
Klaas Freitag
|
d55900561b
|
only restart folderman if the setup wizard was closed with accept.
|
2012-06-12 12:28:58 +02:00 |
|
Klaas Freitag
|
e82681c47f
|
Added ability to work with the custom config file.
|
2012-06-12 12:28:07 +02:00 |
|
Klaas Freitag
|
408b44913e
|
Added ability to work with a custom config file different from the
master one to test temporar connections in the setup wizard.
|
2012-06-12 12:27:02 +02:00 |
|
Klaas Freitag
|
1af154fc96
|
Merge branch 'extlogging'
|
2012-06-11 10:14:52 +02:00 |
|
Klaas Freitag
|
06b3a50e84
|
Wipe the csync statedb after a sync definition is removed.
|
2012-06-11 10:10:07 +02:00 |
|
Georg Ehrke
|
469a7a997c
|
fix spelling of password
|
2012-06-10 21:27:31 +02:00 |
|
Klaas Freitag
|
8b38131b4b
|
Provide proper return value for getauth
|
2012-06-05 18:37:48 +02:00 |
|
Klaas Freitag
|
c0cf575ada
|
Fix csync log encoding
|
2012-06-05 16:30:55 +02:00 |
|
Klaas Freitag
|
9d0a8d35d8
|
- created setupLogBrowser method in application
- removed unused config variable code
|
2012-06-05 15:49:53 +02:00 |
|
Klaas Freitag
|
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 |
|
Klaas Freitag
|
59f821f728
|
Make krazy2 build target optional if krazy is installed.
|
2012-06-04 16:44:49 +02:00 |
|
Klaas Freitag
|
3052506d31
|
Read poll timer settings from config file.
|
2012-05-26 14:37:21 +02:00 |
|
Klaas Freitag
|
dc7c6d1913
|
Fix win32 build again.
|
2012-05-26 13:25:05 +02:00 |
|
Dominik Schmidt
|
b7b617ac28
|
Add krazy target
|
2012-05-21 18:12:25 +02:00 |
|
Klaas Freitag
|
6f7165f9f0
|
A lot of krazy2 (codechecker) fixes.
|
2012-05-21 16:48:49 +02:00 |
|
Klaas Freitag
|
6cf6e1dcba
|
fix exclude.lst reading on MacOSX
|
2012-05-16 15:13:51 +02:00 |
|
Klaas Freitag
|
be7a1ca111
|
Find exclude.lst under MacOS
|
2012-05-16 14:55:19 +02:00 |
|
Klaas Freitag
|
0fdc3cb205
|
Add system info to updatedetector on Linux.
|
2012-05-16 11:56:05 +02:00 |
|
Klaas Freitag
|
d2adecbaac
|
Fix QDesktopServices::openURL for Win32, Qt bug.
|
2012-05-16 11:54:14 +02:00 |
|
Klaas Freitag
|
bbef2ef30e
|
Fix open the local folder action on Win32, workarounded a Qt bug.
|
2012-05-16 11:42:47 +02:00 |
|
Klaas Freitag
|
f9b060fe82
|
Added open ownCloud action to tray menu
|
2012-05-15 18:29:12 +02:00 |
|
Klaas Freitag
|
8510d1fc32
|
Use pause and resume instead of enable and disable
|
2012-05-15 18:03:53 +02:00 |
|
Klaas Freitag
|
0527f997c0
|
Push status window to front if you click on tray icon.
|
2012-05-15 17:52:30 +02:00 |
|
Klaas Freitag
|
c475fb644b
|
Merge branch 'master' of gitorious.org:owncloud/mirall
|
2012-05-15 08:20:30 +02:00 |
|
Klaas Freitag
|
7690734052
|
Enhanced version parsing from status.php
|
2012-05-14 16:22:30 +02:00 |
|
Klaas Freitag
|
f2888274f9
|
simplified url assembly for folderman.
|
2012-05-14 16:18:08 +02:00 |
|
Klaas Freitag
|
5a443bde70
|
Fix tray tooltip again
|
2012-05-14 13:23:04 +02:00 |
|
Klaas Freitag
|
f913790f29
|
Fix try message for disabled folders.
|
2012-05-14 11:51:47 +02:00 |
|
Klaas Freitag
|
64e94708df
|
If a sync folder is removed, terminate if its currently running.
|
2012-05-14 11:09:01 +02:00 |
|
Klaas Freitag
|
f7e5f021c7
|
Fix icon install again, renaming.
|
2012-05-11 10:50:43 +02:00 |
|
Klaas Freitag
|
5bc6e080de
|
Fix icon install.
|
2012-05-11 10:30:35 +02:00 |
|
Klaas Freitag
|
d5ebf0477b
|
Install both application icons
|
2012-05-11 10:28:33 +02:00 |
|
Klaas Freitag
|
aa86561f31
|
write version set in VERSION.cmake to version.h
|
2012-05-11 10:19:15 +02:00 |
|
Klaas Freitag
|
9706d6e545
|
use QLatin1String rather than QString::from...
|
2012-05-11 10:10:23 +02:00 |
|
Klaas Freitag
|
3e99f25578
|
more useful debug output with network reply.
|
2012-05-11 10:09:57 +02:00 |
|
Klaas Freitag
|
f7fd9928b7
|
added a debug line without WIN32 marker.
|
2012-05-11 10:09:27 +02:00 |
|
Klaas Freitag
|
bacc70a299
|
Use the correct icon for sync ok
|
2012-05-02 17:12:45 +02:00 |
|
Klaas Freitag
|
cd6d3644b9
|
set owncloud compile flag for mac osx
|
2012-05-02 17:06:30 +02:00 |
|
Klaas Freitag
|
7fc409152f
|
Display a proper tray icon at app startup
|
2012-05-02 17:05:31 +02:00 |
|
Klaas Freitag
|
496572314d
|
Fix the app icon to be ownclouds
|
2012-05-02 16:33:07 +02:00 |
|
Klaas Freitag
|
8d33a470b1
|
Fixed theming: Made a mirall and a ownCloud icon theme working.
|
2012-05-02 15:50:01 +02:00 |
|
Klaas Freitag
|
125d2a4533
|
Make OWNCLOUD_CLIENT compile flag depending on the compile target.
|
2012-05-02 15:45:38 +02:00 |
|
Klaas Freitag
|
69e6096d14
|
Fixed encoding issue: Do not double encode.
|
2012-05-02 11:40:39 +02:00 |
|
Klaas Freitag
|
f8efb1fc99
|
- Added an open status entry into the tray menu
- fixed some menu glitches on the mac os platform.
|
2012-04-30 16:38:00 +02:00 |
|
Klaas Freitag
|
9c4613e5d2
|
Allow to interrupt running sync task, incl. some cleanups.
|
2012-04-30 08:56:56 +02:00 |
|
Klaas Freitag
|
31b636a423
|
Add a win32 debug line to CMakeLists
|
2012-04-23 10:58:21 +02:00 |
|
Klaas Freitag
|
603151fe08
|
Add proper error message if the owncloud module could not be loaded.
|
2012-04-23 10:58:21 +02:00 |
|
Thomas Müller
|
527bece4a9
|
Backport to Qt 4.6 finished - test against a local installation of owncloud via http
|
2012-04-21 21:03:29 +02:00 |
|
Klaas Freitag
|
633e50e776
|
Removed unsused variable
|
2012-04-21 11:50:20 +02:00 |
|