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
abef7eb3d2
UniqID based syncing, first WIP state.
2012-07-31 11:40:46 +03: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
Dominik Schmidt
336f8fbbd3
Fix error message. Thanks to Danimo for the heads up.
2012-07-31 01:43:41 +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
6ba5bf45d8
removed obsolete FindOpenSSL.
2012-07-30 15:59:55 +03:00
Klaas Freitag
c753525085
removed obsolete FindOpenSSL.
2012-07-30 13:57:57 +03:00
Thomas Mueller
d4e808d45a
use custom FindOpenSSL only for cross compilation in any other cases it is used from the local system
2012-07-30 13:27:59 +03:00
Thomas Mueller
9134955899
use custom FindOpenSSL only for cross compilation in any other cases it is used from the local system
2012-07-26 14:57:15 +03:00
Klaas Freitag
9c2224f8e9
More endings to exlude.lst
2012-07-26 11:56:48 +03:00
Klaas Freitag
36b162aa53
Merge commit 'refs/merge-requests/3' of git://gitorious.org/owncloud/mirall into merge-requests/3
2012-07-26 11:54:06 +03:00
Klaas Freitag
eb83604995
Merge commit 'refs/merge-requests/4' of git://gitorious.org/owncloud/mirall into merge-requests/4
2012-07-26 11:51:56 +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
a89f8fd2ce
Merge commit 'refs/merge-requests/9' of git://gitorious.org/owncloud/mirall into merge-requests/9
2012-07-26 11:43:18 +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
a84361afd3
Merge commit 'refs/merge-requests/8' of git://gitorious.org/owncloud/mirall into merge-requests/8
2012-07-26 11:35:58 +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
1352f6bc39
MD5 Support WIP
2012-07-24 09:36:06 +02:00
Dominik Schmidt
9626f65b6b
Add patched FindOpenSSL to fix cross-compilation for windows
2012-07-23 10:58:13 +02:00
Dominik Schmidt
293b0cecaf
Add patched FindOpenSSL to fix cross-compilation for windows
2012-07-23 10:57:18 +02:00
Klaas Freitag
244d23ac0c
Updated Changelog file.
2012-07-23 09:13:44 +02: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
5246a6fad4
Fix SYSCONFIGDIR check, Patch from Riddell
2012-07-20 12:33:23 +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
718c25d449
Added missing config_test.h input file.
2012-07-20 10:52:30 +02:00
Klaas Freitag
785b7aad60
Use a proper namespace for lastmodified property.
2012-07-20 10:51:39 +02:00
Klaas Freitag
85993d2650
Don't override error code set by timedif in vio init
2012-07-19 21:21:33 +02:00
Klaas Freitag
1104619a52
No atime on apple platform.
2012-07-19 21:11:35 +02:00
Klaas Freitag
b57f33353d
fixed copy and paste errors in error output.
2012-07-19 21:06:18 +02:00
Klaas Freitag
459f25b0ef
owncloud test: Save the downloaded file in /tmp.
2012-07-19 21:04:15 +02:00
Klaas Freitag
cad3da10db
Merge branch 'timedelta' into dav
2012-07-19 15:53:12 +02:00
Klaas Freitag
8402b5b6fa
ownCloud: removed config file access again, correct handling of
...
timediff.
2012-07-19 15:39:53 +02:00
Klaas Freitag
b47ac922ad
ownCloud: handle time delta and access the config file.
2012-07-19 10:50:18 +02:00
Michael Georg Hansen
324120e69c
Make building of tests configurable via configuration switch.
...
This commit makes building of tests configurable via a configuration switch given to CMake: -DUNIT_TESTING=true
Therefore, making changes to CMakeLists.txt for enabling tests is not necessary any more. It is done the same way in CSync.
2012-07-18 22:59:22 +02:00
Michael Georg Hansen
eae20fc537
Configure version.h into the build directory, not the source directory.
2012-07-18 22:46: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
