pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,288 Commits 1 Branch 0 Tags
aa2f9217c0baf6f92600a8e074331f0ecfffb4cc
Commit Graph
329 Commits
Author SHA1 Message Date
Fabien Meghazi b8d65ec78d [FIX] Edit menu shall not appear when not logged in 
bzr revid: fme@openerp.com-20131030151143-2vsp68nb7r3r9v8a
 2013-10-30 16:11:43 +01:00
Fabien Meghazi 90814d781a [MERGE] upstream 
bzr revid: fme@openerp.com-20131030144813-xmjb6i9ayv23aqyi
 2013-10-30 15:48:13 +01:00
Xavier Morel 500804a7c8 [FIX] sitemap 
add HTML sitemap, fix incorrect XML sitemap

bzr revid: xmo@openerp.com-20131030135750-7ljqx4u2qy4xhvm0
 2013-10-30 14:57:50 +01:00
Xavier Morel 4007b79fb3 [FIX] move contenteditable manipulations from banner template to editor object 
otherwise the banner sections stay editable when saved/outside of editable mode

bzr revid: xmo@openerp.com-20131030103048-6tdcvytrf60z89m2
 2013-10-30 11:30:48 +01:00
Fabien Meghazi 7ac3061c42 [WIP] Edit menu dialog 
bzr revid: fme@openerp.com-20131029112450-gnu2c3fl9ddypdf1
 2013-10-29 12:24:50 +01:00
bth-openerp fe5a0843d0 [IMP]oe_small class appied on background of parallax. 
bzr revid: bth@tinyerp.com-20131029072856-3zow9iscbw6qoutd
 2013-10-29 12:58:56 +05:30
Fabien Meghazi 2fc5da3f95 [WIP] Add menu 
bzr revid: fme@openerp.com-20131028162815-2nou1okxovo8thkr
 2013-10-28 17:28:15 +01:00
bth-openerp 36991e7019 [MERGE]Merge trunk-website-al branch. 
bzr revid: bth@tinyerp.com-20131028132942-o6uk559f2lgjyrk8
 2013-10-28 18:59:42 +05:30
Fabien Meghazi eb7b1362cd [WIP] Menu working from database (not yet multi-website) 
bzr revid: fme@openerp.com-20131025152446-si9gsjujzcn40hip
 2013-10-25 17:24:46 +02:00
Fabien Meghazi ec09c0fa2c [ADD] Added website_id in client side context. 
This allow us to comply to the 'ids' argument of website's model method (if needed)

bzr revid: fme@openerp.com-20131025074343-6nqgte7lzj7uhopj
 2013-10-25 09:43:43 +02:00
Fabien Meghazi a597cc59ef [WIP] menus 
bzr revid: fme@openerp.com-20131024141840-ihp2i6huzdlamf94
 2013-10-24 16:18:40 +02:00
Thibault Delavallée fc513a2a1f [IMP] website: publish management 
'Edit' using a wrench is removed, replaced by an entry in the options menu.
The button text size is also increased, because currently in xsmall it is not
matching the website look.

Also re-indented the template.

bzr revid: tde@openerp.com-20131024093420-3vye9g2j11b3y602
 2013-10-24 11:34:20 +02:00
ddm 62bdd7bd9c [FIX] Fixed eCommerce pager 
bzr revid: ddm@openerp.com-20131023145152-smhlpc0eydvos7sx
 2013-10-23 16:51:52 +02:00
bth-openerp f0b7eedd9e [IMP]Name given. 
bzr revid: bth@tinyerp.com-20131023131753-3txmnp97k4smq5fx
 2013-10-23 18:47:53 +05:30
bth-openerp e84f95360f [MERGE]Merge trunk-website-al. 
bzr revid: bth@tinyerp.com-20131023123435-nfv542f67ndogazl
 2013-10-23 18:04:35 +05:30
bth-openerp eb3ef77319 [IMP]Put static image as not getting customize option when coming dynamically. 
bzr revid: bth@tinyerp.com-20131023122735-s9had1vgl90g6zz1
 2013-10-23 17:57:35 +05:30
bth-openerp 32169579f2 [IMP]Image and slogan from res company and added image in background. 
bzr revid: bth@tinyerp.com-20131023120354-ltvzoxwby6dbaytv
 2013-10-23 17:33:54 +05:30
Fabien Meghazi 6495851102 [ADD] UI improvement: Translate "or Edit Master" 
bzr revid: fme@openerp.com-20131023081501-f9owb501j16757bk
 2013-10-23 10:15:01 +02:00
bth-openerp e10e93baa3 [IMP]Removed full size code. 
bzr revid: bth@tinyerp.com-20131022134012-zq2x1unn4vpal9ls
 2013-10-22 19:10:12 +05:30
Paramjit Singh Sahota 928b651c7b [IMP]Improved the layout of parallax snippet for ABOUT US page. 
bzr revid: psa@tinyerp.com-20131022133327-fatvxnkc0bqtejv2
 2013-10-22 19:03:27 +05:30
Fabien Meghazi e4121220c6 [IMP] Language selected label 
bzr revid: fme@openerp.com-20131022132054-o60ekjtbz62sg6p6
 2013-10-22 15:20:54 +02:00
bth-openerp 2c77c2c78a [MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al. 
bzr revid: bth@tinyerp.com-20131022111724-327ql1yk8s5ivfvv
 2013-10-22 16:47:24 +05:30
Fabien Meghazi 120620eb27 [IMP] Check current website in Load a Translation wizard 
bzr revid: fme@openerp.com-20131022121840-0q1n8ci1fpihi4yf
 2013-10-22 14:18:40 +02:00
Fabien Meghazi f85c12e2e7 [IMP] language selector labels 
bzr revid: fme@openerp.com-20131022114622-5ih0ea8e00w01vp0
 2013-10-22 13:46:22 +02:00
bth-openerp 5dfad90298 [IMP]Improve slogan. 
bzr revid: bth@tinyerp.com-20131022105321-91oqncua0kec2zbt
 2013-10-22 16:23:21 +05:30
bth-openerp 6c03d97bd5 [IMP]Added full size in parallax size options. 
bzr revid: bth@tinyerp.com-20131022105056-g9rq4gjqsea0c1ey
 2013-10-22 16:20:56 +05:30
bth-openerp e546cc4550 [IMP]Improved code for parallax. 
bzr revid: bth@tinyerp.com-20131022090654-sobvpbizpzovr5ee
 2013-10-22 14:36:54 +05:30
ddm 2771c47379 [FIX] Ace: proper template naming 
bzr revid: ddm@openerp.com-20131021133957-7ktyfk21a0huj1vl
 2013-10-21 15:39:57 +02:00
ddm 6ee4768a42 [IMP] Tutorial: extract first tour to own style 
bzr revid: ddm@openerp.com-20131021093959-ojzaceh2lul0afja
 2013-10-21 11:39:59 +02:00
bth-openerp 9bd0b9a9f4 [MERGE]Merge trunk-website-al. 
bzr revid: bth@tinyerp.com-20131021065706-1j7ms6rgkcnlxzms
 2013-10-21 12:27:06 +05:30
Fabien Pinckaers ac3123bbd3 [IMP] parallax default photo 
bzr revid: fp@openerp.com-20131020093502-mn4c6s91up3bmqbu
 2013-10-20 11:35:02 +02:00
Fabien Pinckaers bda5d6bbfe [IMP] parallax css. I think we should use elements <img> instead of bg 
bzr revid: fp@openerp.com-20131019211709-5zxz9601fw7qtu1k
 2013-10-19 23:17:09 +02:00
Fabien Pinckaers 07b9c76a1e [IMP] Parallax widget 
bzr revid: fp@openerp.com-20131019205931-t00sxvx71a3wcx3h
 2013-10-19 22:59:31 +02:00
RGA(OpenERP) 8cd32883a3 [IMP] add scroll speed options in parallax snippet 
bzr revid: rgaopenerp-20131018145313-4li3mwyte19n0cf9
 2013-10-18 20:23:13 +05:30
bth-openerp cec7310d82 [IMP]Added parallax slide. 
bzr revid: bth@tinyerp.com-20131018141002-e72q1zczka6hdllb
 2013-10-18 19:40:02 +05:30
Christophe Matthieu a93a0b384b [IMP] website: traceback, node, message in page 500 
bzr revid: chm@openerp.com-20131018114116-ywe7pp49f2cb0dor
 2013-10-18 13:41:16 +02:00
RGA(OpenERP) e78ae5ff76 [IMP] typo 
bzr revid: rgaopenerp-20131018094116-iogn36mj1hbsvhn0
 2013-10-18 15:11:16 +05:30
RGA(OpenERP) ba0778922c [IMP] parallax snippet add size option like banner has 
bzr revid: rgaopenerp-20131018093135-4ux25wdnd73wlah2
 2013-10-18 15:01:35 +05:30
bth-openerp b6b6dd70fc [IMP]background image is changed and no-repeat image. 
bzr revid: bth@tinyerp.com-20131018091642-94byl7s9jlvist0b
 2013-10-18 14:46:42 +05:30
bth-openerp addc2d5f9c [MERGE]Merge trunk-website-al. 
bzr revid: bth@tinyerp.com-20131017131139-whjjmuin6g9cby9r
 2013-10-17 18:41:39 +05:30
Fabien Meghazi 8b78e88ff9 [FIX] Do not overwrite main_object if present 
bzr revid: fme@openerp.com-20131016151257-0r42s8t3xevabfm3
 2013-10-16 17:12:57 +02:00
Christophe Matthieu 2c58996d57 [IMP] website snippet: improve visibility of drop zone 
bzr revid: chm@openerp.com-20131016122905-w93f4vtamiqy79lo
 2013-10-16 14:29:05 +02:00
Fabien Meghazi 1cec2a5b6f [REM] Obsolete route /admin 
bzr revid: fme@openerp.com-20131016093248-2q2c8ppkxxhfx1su
 2013-10-16 11:32:48 +02:00
bth-openerp e3d3cf674c [IMP]Add snippet parallax in about us. 
bzr revid: bth@tinyerp.com-20131015134131-6oe5uh1trjirgxdx
 2013-10-15 19:11:31 +05:30
Fabien Meghazi b475e002bb [FIX] newest werkzeug.utils.escape() does not automatically __repr__ 
bzr revid: fme@openerp.com-20131015103028-2intnc38kzrqgrl3
 2013-10-15 12:30:28 +02:00
Christophe Matthieu c14134140d [FIX] website: snippets banner: add contenteditable 
bzr revid: chm@openerp.com-20131015095335-e9uik9ov1ghp22m4
 2013-10-15 11:53:35 +02:00
Christophe Matthieu 38286d850c [IMP] website: snippets banner: now user can't remove the picture 
bzr revid: chm@openerp.com-20131015095058-ci36cqfm06j9e15s
 2013-10-15 11:50:58 +02:00
Christophe Matthieu e6a831a1a2 [IMP] website: add facets/attributes on product template. Displayed in the left category menu in the ecommerce 
bzr revid: chm@openerp.com-20131015082726-6f1tkyhoaju27p85
 2013-10-15 10:27:26 +02:00
Fabien Meghazi 62d4dee992 [FIX] website_meta_* 
bzr revid: fme@openerp.com-20131014153815-ncmzwgxx5u0xwpeb
 2013-10-14 17:38:15 +02:00
Fabien Meghazi e4edd08ad8 [IMP] Do not use main_object#name field, use website_meta_* fields 
bzr revid: fme@openerp.com-20131014135647-3otn3b6q4gy3olwg
 2013-10-14 15:56:47 +02:00