pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,714 Commits 1 Branch 0 Tags
757ababa68d85fcc417e746292dfe68e2f67aa96
Commit Graph
165 Commits
Author SHA1 Message Date
Christophe Simonis 2cf91d16a5 [MERGE] forward port of branch saas-6 up to 63e92cb 2015-07-22 16:17:54 +02:00
Jeremy Kersten c1d290d699 [FIX] website: fix snippet references 2015-07-15 11:38:15 +02:00
Jeremy Kersten f84bbda221 [FIX] website: fix snippet comparisons 2015-07-15 11:34:28 +02:00
Jeremy Kersten 80db19100a [FIX] website: dont call a dog a cat ! 
Already in V8, the 'Separator' is not a content but a structure snippet !
 2015-07-10 18:15:47 +02:00
Jeremy Kersten 653ccf7b3b [FIX] website: A panel is a panel... 2015-07-10 18:15:46 +02:00
Jeremy Kersten 1621d3fe1a [FIX] website: Fix background option 
Add oe_dark in color list for 'background color', else end user cannot change the color
Force background-color and not background, else background-size from oe_img is overrided
and so the background is displayed with a size:auto instead of cover
 2015-07-10 18:15:46 +02:00
Christophe Matthieu 8c559044a5 [IMP] web_editor: split website into web_editor (to use editor in backend for html field) and website 2015-07-10 17:00:11 +02:00
Jeremy Kersten fa7d32e722 [REV] website, website_quote: partial revert of d1d8802/ed9f8fd 
This hack was just good to print, but break all repsonsive snippets.
Previous commit specify the use of col-md when printing, and so avoid
to add xs anywhere !
 2015-07-10 16:09:32 +02:00
Jeremy Kersten 9b11430887 [FIX] website: basic banner snippet - allow to change background after that the snippet is dropped 2015-07-10 16:09:32 +02:00
Christophe Matthieu 548fb30735 [IMP] website: add a FAQ collapse snippet, the javascript is only used for edition (set id and target to use bootstrap default collapse code). 2015-07-08 16:55:09 +02:00
Christophe Simonis a9471c43b9 [MERGE] forward port of branch saas-6 up to e941c0f 2015-04-17 15:33:00 +02:00
Jay Patel 8a91c9ea6b [IMP] website: relevant data for comparison snippet 2015-04-13 13:39:13 +02:00
Christophe Matthieu 0af0738841 [FIX] website: selection of active background option 
Port of commit 91d6af1dcd774e16f72375012288f5fab7574a4d from website_less
 2015-04-01 11:23:01 +02:00
Nandan Jani d1d8802a40 [IMP] website_quote: support printing for the customer 
Backport of master commit ed9f8fdbb4
 2015-03-13 16:55:11 +01:00
Nandan Jani ed9f8fdbb4 [IMP] website_quote: allow the user to print web quotation to pdf. This required to add col-xs-XX class on snippets, extract SaleOrder Content into a new template to create the report to print. The hidden-print class has been added into rendering report style, since wkhtmltopdf don't really support media-print CSS class. 
Conflicts:
	addons/website_quote/data/website_quotation_demo.xml
 2015-03-10 15:29:19 +01:00
Christophe Simonis 1b3fb3c4a8 [MERGE] forward port of branch 8.0 up to 222b2d3 2015-02-17 18:54:52 +01:00
David Monjoie 1169b52cf1 [IMP] website: each snippet is now in its own template 
It will be useful for the designers so they can call one snippet separately. It also separates the snippets definitions from the panel itself which makes more sense.
 2015-02-17 08:56:58 +01:00
David Monjoie 0d18132b11 Revert "[IMP] website: each snippet is now in its own template" 
Should have checked the js test before pushing to master, was too quick, sorry.

This reverts commit e48b8ada43.
 2015-02-16 14:13:00 +01:00
David Monjoie e48b8ada43 [IMP] website: each snippet is now in its own template 
It will be useful for the designers so they can call one snippet separately. It also separates the snippets definitions from the panel itself which makes more sense.
 2015-02-16 13:48:18 +01:00
Jeremy Kersten 7638fe51a9 [FIX] website*: SEO optimizely 2015-02-13 13:51:01 +01:00
Christophe Matthieu 28ed28f945 [IMP] website: create a new web editor in the backend to edit html field with the website builder 2015-02-12 11:58:12 +01:00
Christophe Matthieu 9477b838c6 [IMP] website editor: move media style options from the customize menu to the top editor bar 2015-01-16 16:38:09 +01:00
Christophe Matthieu cd51e3d317 [FIX] website: can't move panel snippet if it's insert into a column snippet 2015-01-16 16:38:08 +01:00
David Monjoie f8243ffc84 [IMP] Add classnames to snippets body and replace mb*, mt* from snippet body's root by proper styling on the classes 
Backport of 7f07d10 and 6adcccd
 2015-01-12 16:16:36 +01:00
Christophe Matthieu 9069d0127c [IMP] website: use the new summernote editor 2015-01-05 10:59:42 +01:00
Amit Vora 88d3838b56 [IMP] website: correct page hierarchy for comparison snippet 2014-12-05 16:53:10 +01:00
Christophe Simonis a42167d085 [MERGE] forward port of branch 8.0 up to 262eb66 2014-10-21 14:59:56 +02:00
Jeremy Kersten bc38c36503 [FIX] website: fix snippet banner, else when a video is dropped (using a div), the video is moved outside of the span col-md-6 by the editor and so become invisble 2014-10-16 22:15:35 +02:00
Christophe Simonis 52fee2811d [MERGE] forward port of branch 8.0 up to 2b192be 2014-10-16 16:04:39 +02:00
Christophe Matthieu 5175cc34e3 [IMP] website: add snippet for floating picture 2014-10-02 12:39:49 +02:00
Christophe Matthieu f8d5a6727d [FIX] website: repair compatibility with 8.0rc1 carousel (banner) snippets that may be present in existing pages 2014-10-01 18:46:41 +02:00
Richard Mathot 7305d6d030 [REV] website: new blog demo snippets 
This reverts commit 7246b8105b.
 2014-10-01 12:47:33 +02:00
Richard Mathot 7246b8105b [ADD] website: new blog demo snippets 
(cherry picked from commit 6c6df546eb5a99d00d62fc6b497b4b861431423e)
(closes #2631)
 2014-09-30 11:28:09 +02:00
Jay Patel e30b2a7182 [ADD] website: new table format snippet 
(cherry-picked from 383ab454725d9bf8d01392a587c8a2c0c2116294)
(Closes #2429)
 2014-09-23 11:37:39 +02:00
Christophe Matthieu 643c35ab74 [FIX] website.snippet: the background option is not readily usable by the designer 2014-08-27 14:20:20 +02:00
Christophe Matthieu 1b0031c524 [IMP] website.snippet: create automatically the thumbnail; data-option became data-js; add data-eval method; rename check_class into toggle_class 2014-08-27 12:20:14 +02:00
Christophe Matthieu d8ecb5781e [IMP] website.snippet: convert media snippet into the new snippet api 2014-08-25 11:48:36 +02:00
Christophe Matthieu 239b6bc0b5 [IMP] website snippet new option, gallery 
website.snippet: The methods described in javascript will be called automatically from the data-method_name = value on li snippets options. The methods are called in the order relative to children of xml (eg: <li data-method1=value1> ... <li data-method2=value2> ... </ li>, the method1 is then called method2). Methods receive two arguments: type (over, click, reset) and value. data-snippet-id-option becomes data-snippet-id. Several xml options can use the same data-snippet-id.

add a new gallery snippet

convert website_sale to the new option system
 2014-08-21 18:02:14 +02:00
Christophe Matthieu 777a082bfc [IMP] website: create customize theme application and color-picker; Create theme_bootswatch and use less files. 2014-08-08 11:58:40 +02:00
Olivier Dony a1f307b489 [FIX] snippets: avoid orphan full stop (.) 2014-07-30 13:24:39 +02:00
rlu-odoo 8b67a7202d [REF] OpenERP --> Odoo in various UI texts 
Rebranding has been done in:
- data/demo files
- html templates
- help notices
- comments
- logger messages
- and other various messages

(Commit taken from odoo-dev:8.0-improve-openerp-odoo-rlu at rev 7deaa08)

Closes #1260
 2014-07-18 13:45:41 +02:00
Christophe Matthieu 67e15d8d86 [FIX] web: update bootstrap to version 3.2.0; add bootstrap less files 2014-07-10 16:59:31 +02:00
Kersten Jeremy afc2685cee [FIX] wesbite: banner - remove css and use bootstrap for positionning. Now hidden-xs works, we don't lost 50% of width 
bzr revid: jke@openerp.com-20140414142631-k78shkqjqdtcnp83
 2014-04-14 16:26:31 +02:00
Fabien Pinckaers 63c2093d2c [IMP] Larger texts 
bzr revid: fp@tinyerp.com-20140411122232-s8yipnar4tllspm0
 2014-04-11 14:22:32 +02:00
chm@openerp.com 15c035631d [MERGE] from trunk 
bzr revid: chm@openerp.com-20140409154520-eddr2h21bei95xxu
 2014-04-09 17:45:20 +02:00
chm@openerp.com f090689984 [FIX] website: The separator block is not working (no drop zone) 
bzr revid: chm@openerp.com-20140409140733-ne0frg4o7b3c1lr0
 2014-04-09 16:07:33 +02:00
chm@openerp.com 4347df6e4d [FIX] website: Default Url not correct for the button 'contact us' in the block features>Button 
bzr revid: chm@openerp.com-20140409134143-aoiqbd2aqe78hgyc
 2014-04-09 15:41:43 +02:00
chm@openerp.com 88eaa5f26f [IMP] website: remove transform in modile view and change order menu 
bzr revid: chm@openerp.com-20140409124321-cwu86whebzuwtz1e
 2014-04-09 14:43:21 +02:00
chm@openerp.com 673dc5b1d7 [MERGE] from trunk 
bzr revid: chm@openerp.com-20140408132412-7ofhd87laj3uoazj
 2014-04-08 15:24:12 +02:00
Kersten Jeremy f3e405fbe1 [FIX] Website snippet - Update carousel to use bootstrap position and size without CSS. Fix bug with slide-to which doesn't work. 
bzr revid: jke@openerp.com-20140408115424-irsmuhibasonhv7p
 2014-04-08 13:54:24 +02:00