Commit Graph
128 Commits
Author SHA1 Message Date
Xavier Morel 2e352ce187 [MERGE] from trunk
bzr revid: xmo@openerp.com-20131014085459-dhbypq0hg3lzzf3j
2013-10-14 10:54:59 +02:00
Fabien Pinckaers d95570bb40 [IMP] css align stuff
bzr revid: fp@openerp.com-20131012092352-seprp8l827wxy2wy
2013-10-12 11:23:52 +02:00
Fabien Pinckaers 6b0d005d44 [IMP] Align building blocks
bzr revid: fp@openerp.com-20131012090748-vr7aqap73d9l4hqf
2013-10-12 11:07:48 +02:00
Nicolas Wisniewski 6bd53cc2e6 [FIX] blocks section menu returns to vertical
bzr revid: nwi@openerp.com-20131010083037-6lzhc5285tpevg3j
2013-10-10 10:30:37 +02:00
ddm 75bf46996c [FIX] Tour reset bug
bzr revid: ddm@openerp.com-20131009152015-s2p3hjkivls16yk2
2013-10-09 17:20:15 +02:00
ddm 7862c0ba6b [MERGE] trunk-website-al
bzr revid: ddm@openerp.com-20131007122338-0qb0440nmej0onxv
2013-10-07 14:23:38 +02:00
ddm 5a9d5f40ed [FIX] Start tour only when coming from admin
bzr revid: ddm@openerp.com-20131007120743-yevkncvcw655mljh
2013-10-07 14:07:43 +02:00
Xavier Morel 1b232de765 [MERGE] from trunk
bzr revid: xmo@openerp.com-20131007085750-hkv4fgeph0cc65eb
2013-10-07 10:57:50 +02:00
Xavier Morel 0448dff011 [MERGE] from parent
bzr revid: xmo@openerp.com-20131004145046-7cab234xeotx9v7t
2013-10-04 16:50:46 +02:00
Christophe Matthieu 308d08ec07 [FIX] website: footer replace a t-href by href for cke
bzr revid: chm@openerp.com-20131004144646-rk1uq7g5nssbiaua
2013-10-04 16:46:46 +02:00
Christophe Matthieu 865a7cb53a [IMP] website: xml snippets server side + improve loading speed
bzr revid: chm@openerp.com-20131004104133-q1p2fdf153izeqyj
2013-10-04 12:41:33 +02:00
ddm 0dc3c46655 [MERGE] trunk-website-al
bzr revid: ddm@openerp.com-20131004094409-eueito4aochzvmk4
2013-10-04 11:44:09 +02:00
ddm b1c4741154 [IMP] Support for multiple tutorials
bzr revid: ddm@openerp.com-20131004093740-3dxcktks5x2xb4t2
2013-10-04 11:37:40 +02:00
Nicolas Wisniewski 939a344a90 [IMP] Use more compass mixins
bzr revid: nwi@openerp.com-20131004084302-0goiqm0bq7v8up18
2013-10-04 10:43:02 +02:00
ddm c55ad6a023 [FIX] editor.css
bzr revid: ddm@openerp.com-20131003145140-skp3ya6cgv018s8o
2013-10-03 16:51:40 +02:00
ddm 146c43b654 [MERGE] trunk-website-al
bzr revid: ddm@openerp.com-20131003132204-5vctp3gk0udqv71q
2013-10-03 15:22:04 +02:00
Xavier Morel 400ffb7f07 [FIX] disable relative positioning of cke widget wrapper
It's only used to be able to position the drag & drop widget
absolutely, and we've already disabled that one.

Product page is a gory mess of absolute positioning, if product images
are changed into a t-field the relative positioning on the wrapper
makes the image itself disappear completely.

bzr revid: xmo@openerp.com-20131002144554-1rg4zmwu0btf0r0f
2013-10-02 16:45:54 +02:00
ddm e75cc276b9 [MERGED] trunk-website-al
bzr revid: ddm@openerp.com-20131002135938-cq5yfy3lmvpoh2xt
2013-10-02 15:59:38 +02:00
Xavier Morel 7d7cbce6fd [IMP] compass all the things
bzr revid: xmo@openerp.com-20131002112216-sjfvkg2ja0aoss2v
2013-10-02 13:22:16 +02:00
ddm 5f7004c296 [MERGE] trunk-website-al
bzr revid: ddm@openerp.com-20131002085338-8jw3dkqtq842nwhe
2013-10-02 10:53:38 +02:00
ddm 3b49d2cf32 [IMP] Editor basic tour
bzr revid: ddm@openerp.com-20131001160114-d87oq16mxak3xslj
2013-10-01 18:01:14 +02:00
Nicolas Wisniewski 634a4d5348 [IMP] Improve look & feel of snippets ( test purpose )
bzr revid: nwi@openerp.com-20131001134304-cldj2bynoqt5bsb9
2013-10-01 15:43:04 +02:00
Christophe Matthieu 8d3db3a13f [IMP] website_sale: responsible design (css height)
bzr revid: chm@openerp.com-20130927152625-mrr0r2514qfwyisp
2013-09-27 17:26:25 +02:00
Christophe Matthieu 60e2a03700 [IMP] website snippet: background option for paralax and fix banner
bzr revid: chm@openerp.com-20130927124116-o2244s5ufu18pvcx
2013-09-27 14:41:16 +02:00
Fabien Meghazi 5a0f580f5a [MERGE] upstream
bzr revid: fme@openerp.com-20130925085226-lonpq3add9eaaf9q
2013-09-25 10:52:26 +02:00
Fabien Meghazi f79d27e9a3 [FIX] Update translations
bzr revid: fme@openerp.com-20130924190637-0qgzp58lzan8j1oc
2013-09-24 21:06:37 +02:00
Xavier Morel 89fc31a633 [MERGE] from trunk
bzr revid: xmo@openerp.com-20130923120328-0wgd7wxhl1y5qyhr
2013-09-23 14:03:28 +02:00
Fabien Meghazi b783cbf4a6 [ADD] Translator
bzr revid: fme@openerp.com-20130923115417-bq20piq7f11pyjve
2013-09-23 13:54:17 +02:00
Fabien Pinckaers 76ad91d3da [IMP] manifest
bzr revid: fp@openerp.com-20130921095116-z7e6yo0x1eplfadx
2013-09-21 11:51:16 +02:00
Christophe Matthieu 33ab9a60d6 [IMP] website snippet: test with cache and highlight
bzr revid: chm@openerp.com-20130920184211-t7aa6e2nna1th6yi
2013-09-20 20:42:11 +02:00
ddm 691aace187 [FIX] Ace theme-independent font
bzr revid: ddm@openerp.com-20130920151430-p20peqy2kdhjg7gf
2013-09-20 17:14:30 +02:00
Christophe Matthieu 279c07ccc2 [FIX] website swnippet: button, column
bzr revid: chm@openerp.com-20130920144922-g9121ukw4pqm0heo
2013-09-20 16:49:22 +02:00
ddm a139fb4d48 [IMP] small SEO usability improvements
bzr revid: ddm@openerp.com-20130920132832-zlbbg4qk9t7gt4sb
2013-09-20 15:28:32 +02:00
ddm 824c098aef [FIX] seo whitespace
bzr revid: ddm@openerp.com-20130920122232-58di0ozyax9qy4or
2013-09-20 14:22:32 +02:00
Christophe Matthieu 3e890e865b [IMP] website snippet: bigger vertical drop zone
bzr revid: chm@openerp.com-20130920101835-zb531gvn9odtfwld
2013-09-20 12:18:35 +02:00
Christophe Matthieu 746f0b44fa [FIX] website snippet: col-md-12 in float:left
bzr revid: chm@openerp.com-20130920101654-5axnbn0kvmwayqz5
2013-09-20 12:16:54 +02:00
Christophe Matthieu efa72cae7b [FIX] website snippet: drop zone for column with firefox
bzr revid: chm@openerp.com-20130920100821-qyy7n8j8612pzg3k
2013-09-20 12:08:21 +02:00
Christophe Matthieu 8e85305ee1 [IMP] website snippet: join overlay buttons; remove label
bzr revid: chm@openerp.com-20130920084952-j1aqk6371neq1xgt
2013-09-20 10:49:52 +02:00
Fabien Pinckaers 6b7e32155d [IMP] Image selector
bzr revid: fp@tinyerp.com-20130919164855-0xmiofe2a2mkqmq2
2013-09-19 18:48:55 +02:00
Fabien Pinckaers 69bc7fc9ed [IMP] warning dialog for undrop widget
bzr revid: fp@tinyerp.com-20130919155701-szh6spszvfg1kuc1
2013-09-19 17:57:01 +02:00
Christophe Matthieu 20b391d6c8 [IMP] website snippet: add alert for drop error
bzr revid: chm@openerp.com-20130919135001-cfrzyq69ewftu16s
2013-09-19 15:50:01 +02:00
Christophe Matthieu bfb9eb5b0a [fix] website snippets: style options without href
bzr revid: chm@openerp.com-20130919123411-fju5szr855m6g7ou
2013-09-19 14:34:11 +02:00
Christophe Matthieu 5bb8fb451c [IMP] website snippets: customize and style options inside overlay
bzr revid: chm@openerp.com-20130919123206-kmn3tjxvqykvk0z6
2013-09-19 14:32:06 +02:00
Christophe Matthieu fd24ee28c0 [IMP] website snippets: change style of edit button; add font and fix bootstrap; add style menu
bzr revid: chm@openerp.com-20130919102014-vf8etjniyevj40n3
2013-09-19 12:20:14 +02:00
Christophe Matthieu 823cc5549d [IMP] website snippets: horizontal scolling
bzr revid: chm@openerp.com-20130918154831-qiyin8xx07x20qj2
2013-09-18 17:48:31 +02:00
Fabien Pinckaers e29d895993 [IMP] CSS table-panel more visible
bzr revid: fp@openerp.com-20130917200450-php2dcprphvdit5r
2013-09-17 22:04:50 +02:00
Fabien Pinckaers d282697fdf [IMP] style editor bar
bzr revid: fp@openerp.com-20130917195839-4lb2nzuwxl507qn7
2013-09-17 21:58:39 +02:00
Fabien Pinckaers a95f213778 [IMP] snippets by categories, better menu structure
bzr revid: fp@openerp.com-20130917193146-auw1elwdmlk2eb0n
2013-09-17 21:31:46 +02:00
Christophe Matthieu 6a48537430 [IMP] website snippet: preview
bzr revid: chm@openerp.com-20130917140654-olvmy3ckaycv18w3
2013-09-17 16:06:54 +02:00
Christophe Matthieu 7b190b1a56 [IMP] website snippet: preview
bzr revid: chm@openerp.com-20130917133144-jbgre8v0g29kzrdy
2013-09-17 15:31:44 +02:00