Commit Graph
692 Commits
Author SHA1 Message Date
Fabien Meghazi aa2f9217c0 [IMP] Menu entry dialog
bzr revid: fme@openerp.com-20131030160405-crxjr6agtmf2x89p
2013-10-30 17:04:05 +01:00
Fabien Meghazi a87196eece [REM] Removed useless feature
bzr revid: fme@openerp.com-20131030151201-liz3qyn4mkv2ukc2
2013-10-30 16:12:01 +01:00
Fabien Meghazi 90814d781a [MERGE] upstream
bzr revid: fme@openerp.com-20131030144813-xmjb6i9ayv23aqyi
2013-10-30 15:48:13 +01:00
Fabien Meghazi 418e10c382 [IMP] Misc menu improvements
bzr revid: fme@openerp.com-20131030140216-f2fz7p3waur3l8j7
2013-10-30 15:02:16 +01:00
Fabien Meghazi fcdef0faaf [ADD] delete menu
bzr revid: fme@openerp.com-20131030105803-yq7r5lt9vtnd21p0
2013-10-30 11:58:03 +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
ddm 655eed1395 [MERGE] trunk-website-aboutus-parallaxsnippet-bth
Improvements to the CMD 'About Us' page

bzr revid: ddm@openerp.com-20131030101334-8nvqusbvu5nvq5wv
2013-10-30 11:13:34 +01:00
Fabien Meghazi 12801a8cbc [MERGE] upstream
bzr revid: fme@openerp.com-20131030082046-13kxszts8g0ky4wr
2013-10-30 09:20:46 +01:00
Fabien Meghazi 4ae5425fb8 [FIX] Buggy qweb template loading
bzr revid: fme@openerp.com-20131029161128-ko0ocpa0h6kziooh
2013-10-29 17:11:28 +01:00
Fabien Meghazi 07b9cf0f02 [IMP] Save menu is working
bzr revid: fme@openerp.com-20131029143346-nu9skoj5s06hwgw6
2013-10-29 15:33:46 +01:00
Fabien Meghazi 7ac3061c42 [WIP] Edit menu dialog
bzr revid: fme@openerp.com-20131029112450-gnu2c3fl9ddypdf1
2013-10-29 12:24:50 +01:00
Fabien Meghazi 2d0158d8cc [ADD] Menu drag'n dro
bzr revid: fme@openerp.com-20131029083718-e6jrinmh6z48vn5j
2013-10-29 09:37:18 +01:00
bth-openerp 2d3cafbe2a [MERGE]Merge trunk-website-al.
bzr revid: bth@tinyerp.com-20131029065923-v1oizv7bf8f5krj5
2013-10-29 12:29:23 +05:30
Fabien Meghazi 2fc5da3f95 [WIP] Add menu
bzr revid: fme@openerp.com-20131028162815-2nou1okxovo8thkr
2013-10-28 17:28:15 +01:00
Fabien Meghazi b7ed1d3e6d [FIX] Translation shall not prevent website administration
bzr revid: fme@openerp.com-20131028162704-gm1o64e6ww1zurj2
2013-10-28 17:27:04 +01:00
Fabien Meghazi 82c749c91d [IMP] Refactor LinkDialog -> RTELinkDialog
bzr revid: fme@openerp.com-20131028162623-i2a4cixspm8q1crx
2013-10-28 17:26:23 +01:00
Fabien Meghazi 4f3e17ba33 [ADD] jquery-sortable
bzr revid: fme@openerp.com-20131028152725-70hqe2xjeuuhqt2i
2013-10-28 16:27:25 +01:00
Xavier Morel 0db0f20bda [ADD] WIP link combo
bzr revid: xmo@openerp.com-20131028152342-5clhbwwwfcdxxxq0
2013-10-28 16:23:42 +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 26e62b0e0e [IMP] Menu tree from client side
bzr revid: fme@openerp.com-20131028112350-9or1z3e3ndgk4mfg
2013-10-28 12:23:50 +01:00
Fabien Meghazi 321bf56b99 [MERGE] upstream
bzr revid: fme@openerp.com-20131028091527-hbki8epj0oh4s821
2013-10-28 10:15:27 +01:00
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
Xavier Morel 4c88701f3d [FIX] change access rights for customize_template_*
bzr revid: xmo@openerp.com-20131025095952-9ditm4q3fwr9auto
2013-10-25 11:59:52 +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
Xavier Morel c8dd901b04 [FIX] todo/notes
bzr revid: xmo@openerp.com-20131024141024-3kdx3jfcsn8vzsyg
2013-10-24 16:10:24 +02:00
bth-openerp c7ddd83bb2 [REM]Removed image.
bzr revid: bth@tinyerp.com-20131023135506-olydfbpmvtq9vt8h
2013-10-23 19:25:06 +05:30
Xavier Morel 1ce3230d13 [IMP] don't completely wedge the RTE in case save fails. This may well break snippets entirely in case of save failure.
bzr revid: xmo@openerp.com-20131023130918-j5s81t0j60gitr1t
2013-10-23 15:09:18 +02:00
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 6a1bde2151 [ADD]Added logo which is removed in last revision.
bzr revid: bth@tinyerp.com-20131023123254-gd1rrqjdbqoj7iya
2013-10-23 18:02:54 +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 7dd1934585 [FIX] option typo: unable_editor -> enable_editor
bzr revid: fme@openerp.com-20131023091152-h0hxw47hzfor2al8
2013-10-23 11:11:52 +02:00
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
Xavier Morel 3655f43e42 [IMP] warnings and shit
bzr revid: xmo@openerp.com-20131022151144-tblwba9rf77iuidl
2013-10-22 17:11:44 +02:00
Xavier Morel ab20dbc885 [FIX] Attribute values in selectors must be attributes or strings
http://www.w3.org/TR/css3-selectors/#attribute-selectors

http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier

> identifiers (including element names, classes, and IDs in selectors)
> can contain only the characters [a-zA-Z0-9] and ISO 10646 characters
> U+00A0 and higher, plus the hyphen (-) and the underscore (_); they
> cannot start with a digit, two hyphens, or a hyphen followed by a
> digit.

so "0" or "1" is not a valid identifier, must be a string and must
thus be quoted.

bzr revid: xmo@openerp.com-20131022142049-6fq70sielv95kmu0
2013-10-22 16:20:49 +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
bth-openerp 0e558dca0a [Add]Add image.
bzr revid: bth@tinyerp.com-20131022122606-j3jz7rpstk5z5tn8
2013-10-22 17:56:06 +05:30
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
Xavier Morel 58f1b5ad02 [IMP] prevent default on triple-click interrupt
bzr revid: xmo@openerp.com-20131022110015-iewvo1x0jdogswus
2013-10-22 13:00:15 +02:00
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
Fabien Pinckaers 24e87a724a [IMP] uncomment for perf
bzr revid: fp@tinyerp.com-20131021153918-zpnp0xhisorgg3ws
2013-10-21 17:39:18 +02:00
Fabien Pinckaers 05476f9b31 [IMP] double click on image change on banner
bzr revid: fp@tinyerp.com-20131021150124-411dxmatcxorto0m
2013-10-21 17:01:24 +02:00
ddm 2771c47379 [FIX] Ace: proper template naming
bzr revid: ddm@openerp.com-20131021133957-7ktyfk21a0huj1vl
2013-10-21 15:39:57 +02:00
ddm 24c3e4016b [IMP] Ace: light opacity trick
bzr revid: ddm@openerp.com-20131021095158-6037xha2bqyihv0q
2013-10-21 11:51:58 +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
ddm a403bc0318 [IMP] Ace: remember editor width when resizing
bzr revid: ddm@openerp.com-20131021091004-nchmsogl6349az8h
2013-10-21 11:10:04 +02:00
ddm 43a09310cb [FIX] Ace: close editor when 'edit' is pressed
bzr revid: ddm@openerp.com-20131021085229-k60nkz6t0ggrokqu
2013-10-21 10:52:29 +02:00
ddm a57c7e7c92 [IMP] Ace: display 'resize' cursor when hovering over gutter
bzr revid: ddm@openerp.com-20131021084841-efcxt96c5x17u2m1
2013-10-21 10:48:41 +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