Christophe Simonis 1f22653d19 [MERGE] saas-6 forward-port ...

Rebasing a merge commit with a lot of conflicts is a real pain as every
non-automatic conflicts should be redo manually (especially when there
is a lot of file rename that git cannot follow)

2015-05-28 14:31:46 +02:00

..

doc

…

i18n

[I18N] Update translations from Launchpad 8.0 branches

2015-02-18 11:51:07 +01:00

report

[REF] remove vim modelines and resulting trailing blank lines

2014-12-31 15:52:13 +01:00

security

…

static/src/js

[IMP] web+addons: improvement to module system

2015-03-18 09:23:37 +01:00

test

[IMP] Cleanup and refactoring of exception handling

2015-01-16 17:15:18 +01:00

views

[REM] modelines: Gotta catch 'em all

2015-01-08 11:38:58 +01:00

wizard

[REF] remove vim modelines and resulting trailing blank lines

2014-12-31 15:52:13 +01:00

__init__.py

[REF] remove vim modelines and resulting trailing blank lines

2014-12-31 15:52:13 +01:00

__openerp__.py

[MERGE] forward port of branch 8.0 up to 0aab81c

2015-01-19 17:15:56 +01:00

content_index.py

[IMP] Cleanup and refactoring of exception handling

2015-01-16 17:15:18 +01:00

document_data.xml

…

document_demo.xml

…

document_view.xml

[IMP] Reorganize menuitem into coherent block instead of ordering

2015-05-27 15:24:14 +02:00

document.py

[MERGE] forward port of branch 8.0 up to cf4d14c

2015-04-27 17:33:44 +02:00

odt2txt.py

[REF] remove vim modelines and resulting trailing blank lines

2014-12-31 15:52:13 +01:00

std_index.py

[REF] remove vim modelines and resulting trailing blank lines

2014-12-31 15:52:13 +01:00

test_cindex.py

[REF] remove vim modelines and resulting trailing blank lines

2014-12-31 15:52:13 +01:00