Andreas Schneider
7fefdc1800
modules: Fix csync_dummy modules license header.
2012-12-04 13:51:11 +01:00
Andreas Schneider
0a9cca8441
modules: Fix csync_owncloud module license header.
2012-12-04 13:50:14 +01:00
Andreas Schneider
c4f46608dc
modules: Fix csync_smb module license header.
2012-12-04 13:49:40 +01:00
Andreas Schneider
9ca550f93a
modules: Remove csync_sftp2 module.
2012-12-04 13:48:31 +01:00
Andreas Schneider
c2ced426ef
modules: Fix csync_sftp module license header.
2012-12-04 13:48:13 +01:00
Jenkins for ownCloud
ee0125eff6
[tx-robot] updated from transifex
2012-12-04 00:08:09 +01:00
Klaas Freitag
13354b6e8b
Removed old log callback code.
2012-12-03 19:41:44 +01:00
Klaas Freitag
924a19b8ea
Push variable declaration where its needed.
2012-12-03 19:40:06 +01:00
Klaas Freitag
41adbbdea7
Remove LOG_TO_CALLBACK cmake option.
2012-12-03 19:39:39 +01:00
Olivier Goffart
b8fd96fc62
Merge remote-tracking branch 'ogoffart/dav' into dav
2012-12-03 18:23:25 +01:00
Olivier Goffart
cab1324d18
Remove references to ocsync_log.conf
2012-12-03 17:56:47 +01:00
Olivier Goffart
04ebe966d2
Fix compilation after merge.
...
Log in owncloud module is temporarly disabled because it does not
compile as upstream added the context in the log.
2012-12-03 17:45:40 +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
Jenkins for ownCloud
e6409b09a3
[tx-robot] updated from transifex
2012-12-03 00:06:39 +01:00
Jenkins for ownCloud
9c015de00b
[tx-robot] updated from transifex
2012-12-02 00:04:29 +01:00
Jenkins for ownCloud
3a04778f97
[tx-robot] updated from transifex
2012-11-30 00:06:15 +01:00
Klaas Freitag
9c1893fa6d
Fix for #123 : Move declaration to top of function to escape goto.
2012-11-29 13:38:28 +01:00
Daniel Molkentin
53aea61184
doc: Fix PDF generation here, too
2012-11-29 12:25:32 +01:00
Jenkins for ownCloud
b424247daf
[tx-robot] updated from transifex
2012-11-29 00:06:14 +01:00
Dominik Schmidt
097be61c9f
Fix QT_STRICT_ITERATOR errors
2012-11-28 23:31:03 +01:00
Daniel Molkentin
9c853594e8
owncloud: Clean up resources allocated by neon
...
Fixes crashes that result from owncloud running out of FDs,
like oc-920.
2012-11-28 12:57:22 +01:00
Daniel Molkentin
b349caeab1
Build with ancient GCC (4.2 on Mac OS)
2012-11-28 12:03:36 +01:00
Klaas Freitag
593636f135
User feedback on wrong passwd from KeyStore.
2012-11-28 10:44:25 +01:00
Klaas Freitag
70ea325c75
Do not commit devel hardcoded to KeyChain
2012-11-28 10:44:25 +01:00
Klaas Freitag
1a9a9cb402
More QtKeyChain integration.
2012-11-28 10:44:25 +01:00
Klaas Freitag
9d05a53c89
Fix cmake checks on QtKeyChain.
2012-11-28 10:44:25 +01:00
Jenkins for ownCloud
56794e8d7c
[tx-robot] updated from transifex
2012-11-28 00:12:19 +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
Klaas Freitag
bf2181f111
Minor doc fix.
2012-11-27 15:46:17 +01:00
Klaas Freitag
01ba8d4a9b
Wide char fixes for exclude, lock and statedb.
2012-11-27 15:39:06 +01:00
Jenkins for ownCloud
bd0882ccd5
[tx-robot] updated from transifex
2012-11-27 00:11:51 +01:00
Klaas Freitag
0c2564df86
Ready for 1.1.2 Release: Set version.
2012-11-26 14:44:38 +01:00
Jenkins for ownCloud
824c97d618
[tx-robot] updated from transifex
2012-11-26 00:03:28 +01:00
Daniel Molkentin
271d4fa22e
Show last updated timestamp
2012-11-25 02:07:12 +01:00
Daniel Molkentin
a3a0202752
Fix copy/paste error
2012-11-25 01:20:25 +01:00
Daniel Molkentin
0da93f3eb5
Remove doc from the default target
...
The doc target requires strict parallel execution. Make it
a separate target unless we figure out how to do this with cmake.
2012-11-25 01:00:21 +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
Jenkins for ownCloud
f7b7669be6
[tx-robot] updated from transifex
2012-11-25 00:04:10 +01:00
Daniel Molkentin
f607cf55c6
doc: Make fit for use with make latexpdf
2012-11-24 02:35:18 +01:00
Klaas Freitag
f90550775c
Fixed tests to also run on debian host
2012-11-23 12:51:01 +01:00
Klaas Freitag
3fcc56ebbc
Add removal of a test dir
2012-11-23 11:43:39 +01:00
Klaas Freitag
1147e77d67
Fix delete in csync_config
2012-11-23 11:26:24 +01:00
Jenkins for ownCloud
6a33b6ec33
[tx-robot] updated from transifex
2012-11-23 00:04:25 +01:00
Markus Goetz
d74c81feee
Owncloud: Add support for sending a cookie
2012-11-22 21:54:34 +01:00
Daniel Molkentin
ea14dc1a75
Bump version for cpack as well
2012-11-22 16:55:41 +01:00
Daniel Molkentin
e1bf2cc626
Ready for Release Candidate
2012-11-22 15:58:56 +01:00
Klaas Freitag
9eda137c77
Commented too verbose logging.
2012-11-22 15:25:27 +01:00
Klaas Freitag
d15c0d046b
Remove pre marker for version.
2012-11-22 12:34:21 +01:00
Klaas Freitag
f20bbe05bd
Allow alias setting in Settings group name.
2012-11-22 12:32:07 +01:00
Klaas Freitag
c560fc5959
Escape [ and ] in Folder alias and file name.
2012-11-22 12:32:06 +01:00
