P. Christeas 98ab6360ed Merge branch11 into patch18 ...

Branch patch11 had somewhere been lost in bzr hell.

Conflicts:
	account/account_move_line.py
	document_webdav/nodes.py
	document_webdav/webdav_server.py
	event_project/__init__.py
	users_ldap/users_ldap.py

bzr revid: p_christ@hol.gr-20101223155444-ym8r0g4208gm88j9

2010-12-23 17:54:44 +02:00

..

doc

http-well-known: merge into the document_webdav module

2010-11-23 20:53:38 +02:00

i18n

Launchpad automatic translations update.

2010-12-22 05:46:19 +00:00

public_html

doc webdav: install a dummy DAV handler at / , for Nautilus

2010-11-23 20:50:11 +02:00

security

doc webdav: DAV properties for files (ir.attachment), used for locking

2010-12-07 15:39:55 +02:00

test

doc webdav: Have a timeout on YAML tests

2010-12-07 15:39:47 +02:00

__init__.py

doc webdav: initial override of nodes.py

2010-10-12 13:38:58 +03:00

__openerp__.py

http-well-known: merge into the document_webdav module

2010-11-23 20:53:38 +02:00

cache.py

[FIX] document_webdav : Replace <TAB> with four <WHITE SPACE>

2009-12-15 20:01:05 +05:30

dav_fs.py

Merge branch11 into patch18

2010-12-23 17:54:44 +02:00

document_webdav.py

[MERGE]

2010-12-20 15:02:20 +01:00

nodes.py

Merge branch11 into patch18

2010-12-23 17:54:44 +02:00

redirect.py

http-well-known: merge into the document_webdav module

2010-11-23 20:53:38 +02:00

test_davclient.py

doc webdav: Have a timeout on YAML tests

2010-12-07 15:39:47 +02:00

webdav_demo.xml

WebDAV, CalDAV: setup data for folders, calendars, properties

2010-10-12 13:41:21 +03:00

webdav_server.py

Merge branch11 into patch18

2010-12-23 17:54:44 +02:00

webdav_setup.xml

[FIX]: Fix some problem in caldav and Minor Improvement.

2010-11-22 16:13:16 +05:30

webdav_view.xml

doc webdav: DAV properties for files (ir.attachment), used for locking

2010-12-07 15:39:55 +02:00

webdav.py

Merge branch11 into patch18

2010-12-23 17:54:44 +02:00