projects / odoo / odoo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a2b3b47) | patch
[MERGE] backport of trunk revisions:
authorChristophe Simonis <chs@openerp.com>
Tue, 22 Apr 2014 14:32:49 +0000 (16:32 +0200)
committerChristophe Simonis <chs@openerp.com>
Tue, 22 Apr 2014 14:32:49 +0000 (16:32 +0200)
commit12beacda08dd023c1590ecbedcb76f305695e251
treed4504c325c145039bbb5636569da4c18f59e30a1tree | snapshot
parenta2b3b47b38bd67007ec88a9d7a375fcf9091b4e8commit | diff
[MERGE] backport of trunk revisions:

9362 fp@tinyerp.com-20140421205739-rki3bctinjy3amzy [MERGE] new module: website_forum_doc + small fixes (close) in forum
9363 fp@tinyerp.com-20140421213850-19gk3hfz8qxa6fw3 [IMP] improved form view for posts

bzr revid: chs@openerp.com-20140422143249-3cfh18tenn3a5ry1
20 files changed:
addons/website/static/src/css/editor.css diff | blob | history
addons/website/static/src/css/editor.sass diff | blob | history
addons/website_forum/controllers/main.py diff | blob | history
addons/website_forum/models/forum.py diff | blob | history
addons/website_forum/static/src/css/website_forum.css diff | blob | history
addons/website_forum/static/src/css/website_forum.sass diff | blob | history
addons/website_forum/static/src/js/website_forum.js diff | blob | history
addons/website_forum/views/forum.xml diff | blob | history
addons/website_forum/views/website_forum.xml diff | blob | history
addons/website_forum_doc/__init__.py [new file with mode: 0644] blob
addons/website_forum_doc/__openerp__.py [new file with mode: 0644] blob
addons/website_forum_doc/controllers/__init__.py [new file with mode: 0644] blob
addons/website_forum_doc/controllers/main.py [new file with mode: 0644] blob
addons/website_forum_doc/data/doc_data.xml [new file with mode: 0644] blob
addons/website_forum_doc/data/doc_demo.xml [new file with mode: 0644] blob
addons/website_forum_doc/models/__init__.py [new file with mode: 0644] blob
addons/website_forum_doc/models/documentation.py [new file with mode: 0644] blob
addons/website_forum_doc/security/ir.model.access.csv [new file with mode: 0644] blob
addons/website_forum_doc/views/doc.xml [new file with mode: 0644] blob
addons/website_forum_doc/views/website_doc.xml [new file with mode: 0644] blob
Unnamed repository; edit this file 'description' to name the repository.