odoo/odoo.git
10 years ago[FIX] website_mail: access right and xml
Christophe Matthieu [Tue, 6 Aug 2013 09:08:45 +0000 (11:08 +0200)]
[FIX] website_mail: access right and xml

bzr revid: chm@openerp.com-20130806090845-xi47tuk6mfekaedr

10 years ago[IMP] website_mail: subscribe (add followers)
Christophe Matthieu [Tue, 6 Aug 2013 08:56:54 +0000 (10:56 +0200)]
[IMP] website_mail: subscribe (add followers)

bzr revid: chm@openerp.com-20130806085654-n3z6f9u991k9wky3

10 years ago[IMP] website: clean xml
Christophe Matthieu [Tue, 6 Aug 2013 08:04:12 +0000 (10:04 +0200)]
[IMP] website: clean xml

bzr revid: chm@openerp.com-20130806080412-aq2mtf577zt1t3pl

10 years ago[IMP] website_sale: description_website
Christophe Matthieu [Tue, 6 Aug 2013 07:53:46 +0000 (09:53 +0200)]
[IMP] website_sale: description_website

bzr revid: chm@openerp.com-20130806075346-6bi5zbjw39juheih

10 years ago[ADD] Added website osv object + refactoring
Fabien Meghazi [Mon, 5 Aug 2013 16:16:00 +0000 (18:16 +0200)]
[ADD] Added website osv object + refactoring

bzr revid: fme@openerp.com-20130805161600-abms35e0vk47f3i1

10 years ago[FIX] website_event
Christophe Matthieu [Mon, 5 Aug 2013 15:05:14 +0000 (17:05 +0200)]
[FIX] website_event

bzr revid: chm@openerp.com-20130805150514-9zfut5y6xda3rpyx

10 years ago[IMP] website_event
Christophe Matthieu [Mon, 5 Aug 2013 15:03:19 +0000 (17:03 +0200)]
[IMP] website_event

bzr revid: chm@openerp.com-20130805150319-y5iy0zxkq4fkuk5h

10 years ago[IMP] website_event
Christophe Matthieu [Mon, 5 Aug 2013 13:04:20 +0000 (15:04 +0200)]
[IMP] website_event

bzr revid: chm@openerp.com-20130805130420-wlf5qkbamii90jcr

10 years ago[IMP] website_event
Christophe Matthieu [Mon, 5 Aug 2013 12:44:28 +0000 (14:44 +0200)]
[IMP] website_event

bzr revid: chm@openerp.com-20130805124428-9pnqbdb68lruqnxq

10 years ago[IMP] website_mail, website_event
Christophe Matthieu [Mon, 5 Aug 2013 10:21:10 +0000 (12:21 +0200)]
[IMP] website_mail, website_event

bzr revid: chm@openerp.com-20130805102110-5kupl0xdb8tw3x5m

10 years ago[MERGE] trunk-website-insomniak-chm
Christophe Matthieu [Mon, 5 Aug 2013 09:48:05 +0000 (11:48 +0200)]
[MERGE] trunk-website-insomniak-chm

bzr revid: chm@openerp.com-20130805094805-c5y9nklobngdcvz4

10 years ago[MERGE] from website-al
Christophe Matthieu [Mon, 5 Aug 2013 08:38:51 +0000 (10:38 +0200)]
[MERGE] from website-al

bzr revid: chm@openerp.com-20130805083851-i7tiy5ym0ri144er

10 years ago[FIX] Temporary fix until un-webclientization of the editorbar
Fabien Meghazi [Mon, 5 Aug 2013 08:26:38 +0000 (10:26 +0200)]
[FIX] Temporary fix until un-webclientization of the editorbar

bzr revid: fme@openerp.com-20130805082638-62mrzilwcu7wapd5

10 years ago[FIX] website_hr: render args
Fabien Meghazi [Mon, 5 Aug 2013 08:10:53 +0000 (10:10 +0200)]
[FIX] website_hr: render args

bzr revid: fme@openerp.com-20130805081053-e8aifk52f29ehetz

10 years ago[FIX] css class on contact us
Fabien Pinckaers [Sun, 4 Aug 2013 21:49:52 +0000 (23:49 +0200)]
[FIX] css class on contact us

bzr revid: fp@openerp.com-20130804214952-ih6zewevk8gy9twv

10 years ago[IMP] layout
Fabien Pinckaers [Sun, 4 Aug 2013 21:46:12 +0000 (23:46 +0200)]
[IMP] layout

bzr revid: fp@openerp.com-20130804214612-5pf50qtzz4hq7ria

10 years ago[IMP] DOM Simplification
Fabien Pinckaers [Sun, 4 Aug 2013 21:40:58 +0000 (23:40 +0200)]
[IMP] DOM Simplification

bzr revid: fp@openerp.com-20130804214058-wh3f4cxngguetp3w

10 years ago[IMP] changed t-field syntax from <div t-record=record t-field='field'/> to <div...
Fabien Pinckaers [Sun, 4 Aug 2013 20:21:25 +0000 (22:21 +0200)]
[IMP] changed t-field syntax from <div t-record=record t-field='field'/> to <div t-field='record.field'/>

bzr revid: fp@openerp.com-20130804202125-dtawe6zx9yk5x7bd

10 years ago[IMP] website_event: search dates
Christophe Matthieu [Fri, 2 Aug 2013 10:45:04 +0000 (12:45 +0200)]
[IMP] website_event: search dates

bzr revid: chm@openerp.com-20130802104504-7o2uubwabn3yafqc

10 years ago[IMP] website_event: layout
Christophe Matthieu [Fri, 2 Aug 2013 10:11:22 +0000 (12:11 +0200)]
[IMP] website_event: layout

bzr revid: chm@openerp.com-20130802101122-tjhs1iuafqusat67

10 years ago[IMP] website_event: layout
Christophe Matthieu [Fri, 2 Aug 2013 09:11:31 +0000 (11:11 +0200)]
[IMP] website_event: layout

bzr revid: chm@openerp.com-20130802091131-03focn43orp9h771

10 years ago[IMP] website_event
Christophe Matthieu [Fri, 2 Aug 2013 04:49:15 +0000 (06:49 +0200)]
[IMP] website_event

bzr revid: chm@openerp.com-20130802044915-zo5shxu4dw7zn05c

10 years ago[IMP] website_event
Christophe Matthieu [Fri, 2 Aug 2013 04:35:26 +0000 (06:35 +0200)]
[IMP] website_event

bzr revid: chm@openerp.com-20130802043526-btxa9x3xi5co9oru

10 years ago[IMP] website: security and public access
Christophe Matthieu [Fri, 2 Aug 2013 03:55:04 +0000 (05:55 +0200)]
[IMP] website: security and public access

bzr revid: chm@openerp.com-20130802035504-lokijwh57e0q3w6a

10 years ago[IMP] website_hr
Christophe Matthieu [Fri, 2 Aug 2013 03:54:34 +0000 (05:54 +0200)]
[IMP] website_hr

bzr revid: chm@openerp.com-20130802035434-zynhb3ogkozn8ak1

10 years ago[IMP] website_sale: all with SUPERUSER_ID. Todo: specific access rules
Christophe Matthieu [Thu, 1 Aug 2013 14:55:28 +0000 (16:55 +0200)]
[IMP] website_sale: all with SUPERUSER_ID. Todo: specific access rules

bzr revid: chm@openerp.com-20130801145528-578wc6chvltt9af7

10 years ago[MERGE] from trunk-website-public_uid-chm
Christophe Matthieu [Thu, 1 Aug 2013 14:43:12 +0000 (16:43 +0200)]
[MERGE] from trunk-website-public_uid-chm

bzr revid: chm@openerp.com-20130801144312-b5a3xuy5ls0zr04u

10 years ago[IMP] website: public_uid
Christophe Matthieu [Thu, 1 Aug 2013 14:33:47 +0000 (16:33 +0200)]
[IMP] website: public_uid

bzr revid: chm@openerp.com-20130801143347-ihg8nkb1frs08rl2

10 years ago[MERGE] from trunk
Christophe Matthieu [Thu, 1 Aug 2013 12:49:10 +0000 (14:49 +0200)]
[MERGE] from trunk

bzr revid: chm@openerp.com-20130801124910-88hspvafqzkgvctt

10 years agoLaunchpad automatic translations update.
Launchpad Translations on behalf of openerp [Fri, 2 Aug 2013 05:38:52 +0000 (05:38 +0000)]
Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130727050216-3lqngtzz3y4eal03
bzr revid: launchpad_translations_on_behalf_of_openerp-20130728055452-udjnnr7f174dwx7s
bzr revid: launchpad_translations_on_behalf_of_openerp-20130729052557-z3cyhulfa50uou01
bzr revid: launchpad_translations_on_behalf_of_openerp-20130731051700-toxlygnbrq3rfi75
bzr revid: launchpad_translations_on_behalf_of_openerp-20130802053852-k0z9t3xzddxkqibc

10 years ago[IMP] website: add auth_method_public
Christophe Matthieu [Thu, 1 Aug 2013 12:48:50 +0000 (14:48 +0200)]
[IMP] website: add auth_method_public

bzr revid: chm@openerp.com-20130801124850-9ycc9j77wphiiww6

10 years ago[IMP] http.py: Make it possible to implement a new authentication method for the...
niv-openerp [Thu, 1 Aug 2013 11:31:36 +0000 (13:31 +0200)]
[IMP] http.py: Make it possible to implement a new authentication method for the routes

bzr revid: nicolas.vanhoren@openerp.com-20130801113136-5fg9hyrptjckhtkm

10 years ago[FIX] reinstate basic grouping test, replace strictEqual call on widgets by ok(===)
Xavier Morel [Thu, 1 Aug 2013 09:13:26 +0000 (11:13 +0200)]
[FIX] reinstate basic grouping test, replace strictEqual call on widgets by ok(===)

There seems to be a problem with QUnit's serialization routines when
applied to complex widgets (the view here) while running inside
PhantomJS. It does not seem to be cycles in datastructures (that is
handled) but looks related to complex objects linked from multiple
"children" (skipping any object already serialized makes the issue
disappear).

The bug leads to unbounded memory growth, and on runbot to the process
being summarily terminated (likely by the OOM killer) not even
resulting in an OOM error (which is displayed locally). The issue can
not be observed within browsers. This may be a difference in GC
strategy.

The serialization is applied by the driver on high-level comparison
methods (e.g. strictEqual) so the caller can display the structures if
desired.

Replace the strictEqual(a, b) call by ok(a === b) to avoid any risk of
such serialization.

bzr revid: xmo@openerp.com-20130801091326-u2q9e163zls4k8ad

10 years ago[IMP] update QUnit to 1.12.0 (doesn't fix issue, adds features)
Xavier Morel [Thu, 1 Aug 2013 09:12:39 +0000 (11:12 +0200)]
[IMP] update QUnit to 1.12.0 (doesn't fix issue, adds features)

bzr revid: xmo@openerp.com-20130801091239-6lz0ya595i226l85

10 years ago[FIX] unneeded & dangerous start call in async test
Xavier Morel [Thu, 1 Aug 2013 09:11:30 +0000 (11:11 +0200)]
[FIX] unneeded & dangerous start call in async test

bzr revid: xmo@openerp.com-20130801091130-vx7ow7vxifu7ak84

10 years ago[MERGE] insert snippets after the target zones
Frédéric van der Essen [Wed, 31 Jul 2013 15:47:54 +0000 (17:47 +0200)]
[MERGE] insert snippets after the target zones

bzr revid: fva@openerp.com-20130731154754-oqbqvsm5bwqz45aq

10 years ago[MERGE] add call to action to the banner
Frédéric van der Essen [Wed, 31 Jul 2013 15:47:08 +0000 (17:47 +0200)]
[MERGE] add call to action to the banner

bzr revid: fva@openerp.com-20130731154708-v3gd8tdzmfjdo3uc

10 years agoyou can insert snippets 'after' the selected zone, it makes more sense that way
Frédéric van der Essen [Wed, 31 Jul 2013 15:46:03 +0000 (17:46 +0200)]
you can insert snippets 'after' the selected zone, it makes more sense that way

bzr revid: fva@openerp.com-20130731154603-u89aajeivlqvi5uj

10 years ago[MERGE] from upstream
Frédéric van der Essen [Wed, 31 Jul 2013 15:36:54 +0000 (17:36 +0200)]
[MERGE] from upstream

bzr revid: fva@openerp.com-20130731153654-g7htxjci0zk4xev3

10 years ago[FIX] website: display none for carousel's button, move code css
Christophe Matthieu [Wed, 31 Jul 2013 15:36:17 +0000 (17:36 +0200)]
[FIX] website: display none for carousel's button, move code css

bzr revid: chm@openerp.com-20130731153617-8vmrfyg06v96e1bh

10 years agoadd call to action on banner
Frédéric van der Essen [Wed, 31 Jul 2013 15:36:09 +0000 (17:36 +0200)]
add call to action on banner

bzr revid: fva@openerp.com-20130731153609-qlim1711ejoccm9a

10 years ago[FIX] Typo
Fabien Meghazi [Wed, 31 Jul 2013 15:23:36 +0000 (17:23 +0200)]
[FIX] Typo

bzr revid: fme@openerp.com-20130731152336-93sod4y36f3mhe9s

10 years ago[MERGE] working snippets (at last!)
Frédéric van der Essen [Wed, 31 Jul 2013 15:23:17 +0000 (17:23 +0200)]
[MERGE] working snippets (at last!)

bzr revid: fva@openerp.com-20130731152317-wpayrstq75djyoab

10 years ago[MERGE] from upstream
Frédéric van der Essen [Wed, 31 Jul 2013 15:22:46 +0000 (17:22 +0200)]
[MERGE] from upstream

bzr revid: fva@openerp.com-20130731152246-b5b57nblyx4gyugu

10 years agoworking snippets
Frédéric van der Essen [Wed, 31 Jul 2013 15:22:20 +0000 (17:22 +0200)]
working snippets

bzr revid: fva@openerp.com-20130731152220-tpdkg6lh4zt15bre

10 years ago[MERGE] workflows: added some documentation and some tests.
Vo Minh Thu [Wed, 31 Jul 2013 15:16:36 +0000 (17:16 +0200)]
[MERGE] workflows: added some documentation and some tests.

bzr revid: vmt@openerp.com-20130731151636-05lgd5i08rie6yqp

10 years ago[REV] Revert previous commit. Will apply it when web/trunk-website-al will merge...
Fabien Meghazi [Wed, 31 Jul 2013 15:14:30 +0000 (17:14 +0200)]
[REV] Revert previous commit. Will apply it when web/trunk-website-al will merge upstream

bzr revid: fme@openerp.com-20130731151430-6s7x8w0vb0sqskoc

10 years ago[MERGE] from upstream
Frédéric van der Essen [Wed, 31 Jul 2013 15:12:30 +0000 (17:12 +0200)]
[MERGE] from upstream

bzr revid: fva@openerp.com-20130731151230-vyg6y8362khlu0ry

10 years ago[REM] workflows: removed temporary run.py script from the tests.
Vo Minh Thu [Wed, 31 Jul 2013 15:11:04 +0000 (17:11 +0200)]
[REM] workflows: removed temporary run.py script from the tests.

bzr revid: vmt@openerp.com-20130731151104-mxo8qu5x12krto0h

10 years ago[IMP] forward 'debug' directive to embedded client
Fabien Meghazi [Wed, 31 Jul 2013 15:11:03 +0000 (17:11 +0200)]
[IMP] forward 'debug' directive to embedded client

bzr revid: fme@openerp.com-20130731151103-f6spqkfl9pcekasj

10 years ago[DOC] workflows: typos, and removed inaccurate environment symbols.
Vo Minh Thu [Wed, 31 Jul 2013 15:09:43 +0000 (17:09 +0200)]
[DOC] workflows: typos, and removed inaccurate environment symbols.

bzr revid: vmt@openerp.com-20130731150943-etfvn08fnkhcecvt

10 years ago[FIX] disable ckeditor's magicline plugin (not very useful and breaks droppables)
Xavier Morel [Wed, 31 Jul 2013 15:07:33 +0000 (17:07 +0200)]
[FIX] disable ckeditor's magicline plugin (not very useful and breaks droppables)

bzr revid: xmo@openerp.com-20130731150733-mna9qoygkn6qiers

10 years ago[IMP] website: carousel edition
Christophe Matthieu [Wed, 31 Jul 2013 15:05:11 +0000 (17:05 +0200)]
[IMP] website: carousel edition

bzr revid: chm@openerp.com-20130731150511-8wfza72kb6lynmor

10 years ago[MERGE] new banner design
Frédéric van der Essen [Wed, 31 Jul 2013 15:02:08 +0000 (17:02 +0200)]
[MERGE] new banner design

bzr revid: fva@openerp.com-20130731150208-d2e9wo71ztr4psjj

10 years ago[MERGE] from upstream
Frédéric van der Essen [Wed, 31 Jul 2013 15:01:33 +0000 (17:01 +0200)]
[MERGE] from upstream

bzr revid: fva@openerp.com-20130731150133-rk2gl2yn74725vb0

10 years agomade the banner beautiful
Frédéric van der Essen [Wed, 31 Jul 2013 14:53:27 +0000 (16:53 +0200)]
made the banner beautiful

bzr revid: fva@openerp.com-20130731145327-efm61ao2oh4f043q

10 years ago[FIX] avoid error message in the web client when we go on the Apps menu, replace...
niv-openerp [Wed, 31 Jul 2013 14:41:29 +0000 (16:41 +0200)]
[FIX] avoid error message in the web client when we go on the Apps menu, replace it with a warning message explaining that the apps is not working currently

bzr revid: nicolas.vanhoren@openerp.com-20130731144129-x9po16ihtbp4rj8m

10 years agomain template in one div
Antony Lesuisse [Wed, 31 Jul 2013 14:40:22 +0000 (16:40 +0200)]
main template in one div

bzr revid: al@openerp.com-20130731144022-mu2fxz3y5vedoqs7

10 years ago[HACK] website: hack for scrolling of pseudo snippet carousel. To do: change snippet
Christophe Matthieu [Wed, 31 Jul 2013 14:14:24 +0000 (16:14 +0200)]
[HACK] website: hack for scrolling of pseudo snippet carousel. To do: change snippet

bzr revid: chm@openerp.com-20130731141424-pgobjw0yvri7sqaf

10 years ago[HACK] Quick hack in order to disable parents and childs links of a raw editable...
Fabien Meghazi [Wed, 31 Jul 2013 14:06:31 +0000 (16:06 +0200)]
[HACK] Quick hack in order to disable parents and childs links of a raw editable element

bzr revid: fme@openerp.com-20130731140631-40a85qnk0ao54zlz

10 years ago[IMP] website: change boutton layout for carousel
Christophe Matthieu [Wed, 31 Jul 2013 14:03:24 +0000 (16:03 +0200)]
[IMP] website: change boutton layout for carousel

bzr revid: chm@openerp.com-20130731140324-d0ujwllud3155en2

10 years ago[IMP] doc: improve workflow documentation
Raphael Collet [Wed, 31 Jul 2013 13:58:14 +0000 (15:58 +0200)]
[IMP] doc: improve workflow documentation

bzr revid: rco@openerp.com-20130731135814-386v5w6rkc40kwwv

10 years ago[IMP] website_hr: begin
Christophe Matthieu [Wed, 31 Jul 2013 13:54:34 +0000 (15:54 +0200)]
[IMP] website_hr: begin

bzr revid: chm@openerp.com-20130731135434-am7nqltt16riikxa

10 years ago[MERGE] making snippets look cool enough for a video demo
Frédéric van der Essen [Wed, 31 Jul 2013 13:51:09 +0000 (15:51 +0200)]
[MERGE] making snippets look cool enough for a video demo

bzr revid: fva@openerp.com-20130731135109-h2uynfn435ol950g

10 years ago[MERGE] from upstream
Frédéric van der Essen [Wed, 31 Jul 2013 13:49:58 +0000 (15:49 +0200)]
[MERGE] from upstream

bzr revid: fva@openerp.com-20130731134958-m04umqrjepb6duqi

10 years agofixing snippets (just enough for the video demo)
Frédéric van der Essen [Wed, 31 Jul 2013 13:40:57 +0000 (15:40 +0200)]
fixing snippets (just enough for the video demo)

bzr revid: fva@openerp.com-20130731134057-clqxu1mj149dsbhz

10 years ago[FIX] desactivated test creating random false positive
niv-openerp [Wed, 31 Jul 2013 13:35:04 +0000 (15:35 +0200)]
[FIX] desactivated test creating random false positive

bzr revid: nicolas.vanhoren@openerp.com-20130731133504-vt2fx11jziyad47e

10 years ago[FIX] attempt to solve false-positive in js tests on the runbot
niv-openerp [Wed, 31 Jul 2013 13:19:33 +0000 (15:19 +0200)]
[FIX] attempt to solve false-positive in js tests on the runbot

bzr revid: nicolas.vanhoren@openerp.com-20130731131933-ur5vdahgnbjsj16o

10 years ago[FIX] website: apply noupdate tag on new created page
Christophe Matthieu [Wed, 31 Jul 2013 12:58:17 +0000 (14:58 +0200)]
[FIX] website: apply noupdate tag on new created page

bzr revid: chm@openerp.com-20130731125817-g4itvqhkso129nuf

10 years ago[FIX] website: create new page. Replace website.default_page by the path name
Christophe Matthieu [Wed, 31 Jul 2013 12:40:27 +0000 (14:40 +0200)]
[FIX] website: create new page. Replace website.default_page by the path name

bzr revid: chm@openerp.com-20130731124027-7yuj9u50iozpyqb9

10 years ago[FIX] branding opt-out for div#push-footer
Fabien Meghazi [Wed, 31 Jul 2013 12:37:43 +0000 (14:37 +0200)]
[FIX] branding opt-out for div#push-footer

bzr revid: fme@openerp.com-20130731123743-9emfvc5g2k5g5s5i

10 years ago[MERGE] image upload in RTE, disable custom context menu
Xavier Morel [Wed, 31 Jul 2013 12:15:14 +0000 (14:15 +0200)]
[MERGE] image upload in RTE, disable custom context menu

bzr revid: xmo@openerp.com-20130731121514-e0t7v9eippnv4jlo

10 years ago[IMP] disable ckeditor's context menu
Xavier Morel [Wed, 31 Jul 2013 12:13:58 +0000 (14:13 +0200)]
[IMP] disable ckeditor's context menu

bzr revid: xmo@openerp.com-20130731121358-x400woct28kh79xf

10 years ago[ADD] images upload
Xavier Morel [Wed, 31 Jul 2013 12:13:43 +0000 (14:13 +0200)]
[ADD] images upload

bzr revid: xmo@openerp.com-20130731121343-0uy1cfga6rbilkj5

10 years ago[MERGE] from upstream
Frédéric van der Essen [Wed, 31 Jul 2013 12:13:04 +0000 (14:13 +0200)]
[MERGE] from upstream

bzr revid: fva@openerp.com-20130731121304-npx5jvby2der0xad

10 years ago[FIX] website: go to website => cycle auto reload
Christophe Matthieu [Wed, 31 Jul 2013 11:49:49 +0000 (13:49 +0200)]
[FIX] website: go to website => cycle auto reload

bzr revid: chm@openerp.com-20130731114949-h3lddpitkv6f0wmh

10 years ago[MERGE] from trunk
Xavier Morel [Wed, 31 Jul 2013 11:38:46 +0000 (13:38 +0200)]
[MERGE] from trunk

bzr revid: xmo@openerp.com-20130731113846-ji9exo91sms842ju

10 years ago[FIX] website: go to website => cycle auto reload
Christophe Matthieu [Wed, 31 Jul 2013 10:28:34 +0000 (12:28 +0200)]
[FIX] website: go to website => cycle auto reload

bzr revid: chm@openerp.com-20130731102834-m8zox13t40imt8i7

10 years ago[WHATEVER] make snippet editor do stuff
Xavier Morel [Wed, 31 Jul 2013 10:22:48 +0000 (12:22 +0200)]
[WHATEVER] make snippet editor do stuff

bzr revid: xmo@openerp.com-20130731102248-kl5upc2w48h9bisv

10 years ago[IMP] Added compass compilation to grunt file
niv-openerp [Wed, 31 Jul 2013 10:20:37 +0000 (12:20 +0200)]
[IMP] Added compass compilation to grunt file

bzr revid: nicolas.vanhoren@openerp.com-20130731102037-ai9ldek3vaph27l8

10 years ago[IMP] Removed the JavaScript module system of OpenERP and added a layer of retro...
niv-openerp [Wed, 31 Jul 2013 09:53:36 +0000 (11:53 +0200)]
[IMP] Removed the JavaScript module system of OpenERP and added a layer of retro-compatibility instead.
Also create the openerpframework.js file and put some basic tools in it. Made it reusable so it can be added in any project.

bzr revid: nicolas.vanhoren@openerp.com-20130731095336-9a5jchoe89svkfo7

10 years ago[MERGE] with trunk-website-al
Christophe Matthieu [Wed, 31 Jul 2013 09:38:53 +0000 (11:38 +0200)]
[MERGE] with trunk-website-al

bzr revid: chm@openerp.com-20130731093853-ynkbq3zm7588d2rr

10 years ago[IMP] website_mail: remove useless div
Christophe Matthieu [Wed, 31 Jul 2013 09:38:19 +0000 (11:38 +0200)]
[IMP] website_mail: remove useless div

bzr revid: chm@openerp.com-20130731093819-yvg0ahh1baj09uzl

10 years ago[IMP] website_mail: layout comments on blog
Christophe Matthieu [Wed, 31 Jul 2013 09:26:27 +0000 (11:26 +0200)]
[IMP] website_mail: layout comments on blog

bzr revid: chm@openerp.com-20130731092627-inzev1oqbn3gt63j

10 years ago[HACK] filter snippets so ckeditor is not applied to them
Xavier Morel [Wed, 31 Jul 2013 09:15:13 +0000 (11:15 +0200)]
[HACK] filter snippets so ckeditor is not applied to them

bzr revid: xmo@openerp.com-20130731091513-u3fklrijeuc6l80a

10 years ago[IMP] website_mail: clean css
Christophe Matthieu [Wed, 31 Jul 2013 09:13:37 +0000 (11:13 +0200)]
[IMP] website_mail: clean css

bzr revid: chm@openerp.com-20130731091337-ni60flzow98mc4mz

10 years ago[MERGE] with trunk-website-al
Christophe Matthieu [Wed, 31 Jul 2013 09:07:46 +0000 (11:07 +0200)]
[MERGE] with trunk-website-al

bzr revid: chm@openerp.com-20130731090746-r4uviyui176ngwbm

10 years ago[FIX] disable automatic insertion of paragraphs in content sections by ckeditor
Xavier Morel [Wed, 31 Jul 2013 09:01:51 +0000 (11:01 +0200)]
[FIX] disable automatic insertion of paragraphs in content sections by ckeditor

bzr revid: xmo@openerp.com-20130731090151-q0gqmjx50wf6nm2n

10 years ago[MERGE] custom input background removal
Frédéric van der Essen [Wed, 31 Jul 2013 08:23:32 +0000 (10:23 +0200)]
[MERGE] custom input background removal

bzr revid: fva@openerp.com-20130731082332-f72qrnsd7eubtftt

10 years ago[MERGE] from upstream
Frédéric van der Essen [Wed, 31 Jul 2013 08:21:35 +0000 (10:21 +0200)]
[MERGE] from upstream

bzr revid: fva@openerp.com-20130731082135-cm97mp7w5l3nwpib

10 years agoremove custom input background
Frédéric van der Essen [Wed, 31 Jul 2013 08:21:17 +0000 (10:21 +0200)]
remove custom input background

bzr revid: fva@openerp.com-20130731082117-r1qzq4b3mkcet2nl

10 years ago[MERGE] quick fixes for the shopping cart display
Frédéric van der Essen [Wed, 31 Jul 2013 08:13:59 +0000 (10:13 +0200)]
[MERGE] quick fixes for the shopping cart display

bzr revid: fva@openerp.com-20130731081359-xx2nrwzgl96eiztq

10 years ago[MERGE] from upstream
Frédéric van der Essen [Wed, 31 Jul 2013 08:13:28 +0000 (10:13 +0200)]
[MERGE] from upstream

bzr revid: fva@openerp.com-20130731081328-g6xnaaugia3866cn

10 years agoquick fix for the shopping cart display
Frédéric van der Essen [Wed, 31 Jul 2013 08:13:04 +0000 (10:13 +0200)]
quick fix for the shopping cart display

bzr revid: fva@openerp.com-20130731081304-1j2p1o13e061ka1q

10 years ago[FIX] qweb.py: html rendering
Christophe Matthieu [Wed, 31 Jul 2013 08:09:13 +0000 (10:09 +0200)]
[FIX] qweb.py: html rendering

bzr revid: chm@openerp.com-20130731080913-aev9gz72vyev9ryj

10 years ago[MERGE] making the editor top bar the same height as the openerp topbar
Frédéric van der Essen [Wed, 31 Jul 2013 07:58:20 +0000 (09:58 +0200)]
[MERGE] making the editor top bar the same height as the openerp topbar

bzr revid: fva@openerp.com-20130731075820-8mp2a2rec44bv29u

10 years ago[MERGE] from upstream
Frédéric van der Essen [Wed, 31 Jul 2013 07:57:41 +0000 (09:57 +0200)]
[MERGE] from upstream

bzr revid: fva@openerp.com-20130731075741-6bs9qdslevxzeesd

10 years ago[FIX] whitelist section, header and footer for edition
Xavier Morel [Wed, 31 Jul 2013 07:56:35 +0000 (09:56 +0200)]
[FIX] whitelist section, header and footer for edition

bzr revid: xmo@openerp.com-20130731075635-wr3tdl2p12j34cmw

10 years agomaking the editor bar the same height as the rest of openerp
Frédéric van der Essen [Wed, 31 Jul 2013 07:56:11 +0000 (09:56 +0200)]
making the editor bar the same height as the rest of openerp

bzr revid: fva@openerp.com-20130731075611-lurg5zye995r9te7

10 years ago[MERGE] fixing the navbar edition
Frédéric van der Essen [Wed, 31 Jul 2013 07:50:16 +0000 (09:50 +0200)]
[MERGE] fixing the navbar edition

bzr revid: fva@openerp.com-20130731075016-pt1xzxm2zo3sjafu