Olivier Goffart
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
Daniel Molkentin
1ca8ebebd9
Do not add shortcuts to non-existent files
2013-04-23 17:19:27 +02:00
fastfwd
6695b50965
Fix Issue #382
...
Just a couple of typo/cut-and-paste errors.
2013-04-22 01:22:16 -07:00
Daniel Molkentin
1c6523bcec
Add plugin for screenreader support
2013-03-21 17:49:03 +03:00
Andreas Schneider
480c97c487
cmake: Update compiler flags.
2013-03-14 10:10:41 +01:00
Daniel Molkentin
dbec98ff48
Manual update of avail translations
2013-02-21 18:35:33 +03:00
Daniel Molkentin
2b8925c210
FindNeon: Work on non-xbuilds as well
2013-02-08 16:08:29 +03:00
Daniel Molkentin
79159ae32c
Remove debug line
2013-02-08 15:56:26 +03:00
Daniel Molkentin
a6f63aea94
Safely detect neon-config in cross builds
2013-02-08 15:46:42 +03:00
Daniel Molkentin
9c0c693081
Add iconv support to convert charsets to different platforms.
2013-02-06 15:11:40 +01:00
Klaas Freitag
7734656ae3
Make mirall packager for win bundle the new openSSL dlls.
2013-02-05 14:37:39 +01:00
Daniel Molkentin
a04cf32a69
No need to ship ocsync.conf
2013-01-30 09:48:45 +01:00
Daniel Molkentin
bfee6402a6
Simplify NSIS template
2013-01-25 12:56:00 +01:00
Klaas Freitag
1385aab65d
Changed FindCSync module to not check relative pathes + docu.
2013-01-22 15:08:56 +01:00
Klaas Freitag
1db825a733
Set path shortcuts for win32 as well.
2013-01-21 13:38:33 +01:00
Daniel Molkentin
635cb4dc7c
NSIS: Remove GnuTLS remainders
2013-01-16 14:41:12 +01:00
Daniel Molkentin
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
Klaas Freitag
ba21a9b3a2
Check if neon was built with LFS support.
2013-01-09 15:03:20 +01:00
Daniel Molkentin
e6b9c16d04
Update About dialog
2012-12-20 20:35:21 +01:00
Markus Goetz
bd71ddf0aa
Iconv: Also search in /usr on OS X
2012-12-11 14:25:56 +01:00
Daniel Molkentin
49d2fd685b
iconv support
...
This allows for files on mac to automatically be converted to UNC
2012-12-07 13:03:01 +01:00
Daniel Molkentin
ff1706c729
Add libqtkeychain dll to NSIS
2012-12-06 17:53:04 +01:00
Daniel Molkentin
8f9ad524c2
Find inotify on multiarch debian/ubuntu
2012-12-04 17:48:14 +01:00
Olivier Goffart
95edd6a9de
Merge remote-tracking branch 'origin/master' into dav
...
Conflicts:
config/ocsync_log.conf
src/csync.c
src/csync.h
src/csync_config.c
src/csync_log.h
src/csync_private.h
src/csync_statedb.c
tests/csync_tests/check_csync_config.c
2012-12-03 17:32:08 +01:00
Klaas Freitag
9d05a53c89
Fix cmake checks on QtKeyChain.
2012-11-28 10:44:25 +01:00
Dominik Schmidt
2b2eb853fc
Add qtkeychain to cmake - WIP read password from keychain.
...
Conflicts:
CMakeLists.txt
2012-11-27 19:28:03 +01:00
Daniel Molkentin
78c7dc95a0
Add doc cmake targets (HTML, PDF, QtHelp, CHM, man)
...
make doc will build all of the above, except for CHM,
which needs manual preparation and can be built with
make doc-chm. See doc/scripts/README.rst for details.
We do our best to ensure to detect the required tools
before adding targets, so a build should always succeed.
Exception: On Debian and Ubuntu, the following packages are
required to build the PDF target (in addition to pdflatex
itself, which is autodetected):
* texlive-latex-recommended
* texlive-latex-extra
* texlive-fonts-recommended
If pdflatex is present, but those are not, the doc target
will fail.
Results can be found in $BUILDDIR/doc/$format.
2012-11-25 00:38:47 +01:00
Markus Goetz
80d53ff4bd
Enable compilation with static iniparser and sqlite
2012-11-07 17:46:13 +01:00
Daniel Molkentin
4fbfe7bfef
Installer: Only show license on special request
...
GPL is a distribution license, and should thus
not be required to be accepted upon installation.
2012-11-02 16:14:33 +01:00
Andreas Schneider
0a6d7435b5
cmake: Get rid of log4c.
2012-10-30 11:27:21 +01:00
Klaas Freitag
2bb52ef6f9
Merge branch 'master' into dav - get cmocka tests and database move.
...
Conflicts:
CMakeLists.txt
cmake/Modules/FindCMocka.cmake
src/csync.c
src/csync_exclude.c
src/csync_reconcile.c
src/csync_statedb.c
src/csync_update.c
src/csync_util.c
src/vio/csync_vio.c
tests/CMakeLists.txt
tests/csync_tests/check_csync_exclude.c
tests/csync_tests/check_csync_statedb_load.c
tests/csync_tests/check_csync_statedb_query.c
tests/csync_tests/check_csync_update.c
tests/std_tests/check_std_c_path.c
2012-10-27 19:27:14 +02:00
Andreas Schneider
cea0c9e85f
cmake: Fix compile option on UNIX with Clang.
2012-10-22 11:20:30 +02:00
Andreas Schneider
c24a18cbfd
cmake: Cleanup testing and enable test target.
2012-10-19 19:07:15 +02:00
Andreas Schneider
b1b0c2c510
tests: Start to use cmocka for the tests.
2012-10-16 10:37:40 +02:00
Daniel Molkentin
aad21c8c4a
Add license to Windows installer
2012-10-12 14:44:21 +02:00
Daniel Molkentin
62a36cd3bb
CMake: Also set CSYNC_BINARY_DIR
...
...so NSIS finds its resource in the right place.
2012-10-10 15:15:19 +02:00
Daniel Molkentin
aa63a789dc
Fix for prev. commmit
2012-10-10 14:19:29 +02:00
Daniel Molkentin
d599c4532c
replace relative csync buildir detection magic
...
If you do not want to run make install for lib(o)csync,
pass -DCSYNC_LIBRARY_PATH=$your_csync_builddir
and -DCSYNC_INCLUDE_PATH=$your_csync_srcdir/src
to cmake when building mirall.
2012-10-10 14:04:24 +02:00
Daniel Molkentin
6459f574cc
Prepare for Mac package signing.
2012-10-09 01:40:43 +02:00
Daniel Molkentin
fdfafb6e70
NSI: add proper version of ocsync.conf
2012-10-09 01:40:43 +02:00
Klaas Freitag
7e1c58b602
Fix include path search.
2012-10-05 17:13:23 +02:00
Klaas Freitag
e0a21ebfd6
Fix to find the header even from installed ocsync packages.
2012-10-05 17:02:39 +02:00
Klaas Freitag
736a8dc457
fixed name of the csync owncloud module.
2012-10-05 10:03:16 +02:00
Daniel Molkentin
af99be4cd5
NSIS: shut down binary before uninstall
2012-09-27 10:38:31 +02:00
Klaas Freitag
fabb353158
Use Qt proxy setting in csync in case its "default proxy"
2012-10-02 13:24:10 +02:00
Klaas Freitag
de60d53a78
Merge branch 'sslerrordialog' of https://github.com/sebasje/mirall into sebasje-sslerrordialog
...
Conflicts:
src/mirall/application.cpp
src/mirall/application.h
src/mirall/owncloudinfo.cpp
2012-10-02 12:34:06 +02:00
Klaas Freitag
d09693f191
Read sync-exclude.lst from /etc/ownCloud, renamed from exclude.lst.
2012-09-27 13:16:14 +02:00
Daniel Molkentin
9d479f9061
Installers on Windows are called Setup
...
Also remove bogus manual line break.
2012-09-24 07:19:09 +02:00
Daniel Molkentin
783207fa40
At least the Program group should be in 'Minimal'.
2012-09-24 03:45:12 +02:00
Daniel Molkentin
ea123b1705
Fix typo
2012-09-24 03:44:32 +02:00