Commit Graph

115 Commits

Author SHA1 Message Date
Christophe Simonis b8089a1521 [MERGE] forward port of branch saas-4 up to revid 9410 chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1
bzr revid: chs@openerp.com-20140507170112-bjeltv2b0coy60am
2014-05-07 19:01:12 +02:00
chm@openerp.com 3f032f3f97 [FIX] website editor: background image
bzr revid: chm@openerp.com-20140505150722-gwewelvu3uv6joen
2014-05-05 17:07:22 +02:00
chm@openerp.com ee7ff4bd07 [MERGE] from trunk
bzr revid: chm@openerp.com-20140423154852-gzegxqrzb2sj01zl
2014-04-23 17:48:52 +02:00
chm@openerp.com ff9ae691d5 [FIX] website: snippet editor: speed up save view (construct only option with clean_for_save method); fix carousel arrow
bzr revid: chm@openerp.com-20140423095901-q945d4593uet41xy
2014-04-23 11:59:01 +02:00
chm@openerp.com 02a9df59b7 [FIX] website: media editor: display popup when user click on save button of the view
bzr revid: chm@openerp.com-20140418150831-k7fnd7y6ywrmxv6j
2014-04-18 17:08:31 +02:00
chm@openerp.com dbe1b81d15 [MERGE] from trunk
bzr revid: chm@openerp.com-20140416074634-jkcn3ae30q9uqnsi
2014-04-16 09:46:34 +02:00
Christophe Simonis 61da3f4aba [MERGE] forward port of branch saas-3 up to revid 9409 dle@openerp.com-20140415101427-a6r7lgy50x9bdah3
bzr revid: chs@openerp.com-20140415142934-rlka4vkxd34fkil8
2014-04-15 16:29:34 +02:00
Kersten Jeremy 66e72fec54 [FIX] Website - Don't set active on OpenDialog link else the user cannot click on it again after.
bzr revid: jke@openerp.com-20140414094803-bfyvu3wizy09n53c
2014-04-14 11:48:03 +02:00
chm@openerp.com aa6386467a [FIX] website: snippet clean_for_save: filter snippet before create overlay
bzr revid: chm@openerp.com-20140411115314-xr5yutao88j8fusu
2014-04-11 13:53:14 +02:00
Olivier Dony 7c75b5e004 [FIX] website: avoid discarding snippet animator after edit + properly restart animation while disabling clicks
bzr revid: odo@openerp.com-20140410174314-vecg7inmfgm7r5fq
2014-04-10 19:43:14 +02:00
Kersten Jeremy bafa8e448d [FIX] Website_mail - Add selectors to allow drag and drop of snippet in email template
bzr revid: jke@openerp.com-20140414143001-26p3ka7dwb1er6y0
2014-04-14 16:30:01 +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
chm@openerp.com 8da0820a88 [FIX] website: media editor: when the user save the picture, the dialog box re-open automatically. Do not re-active snippet when we save a field image
bzr revid: chm@openerp.com-20140414082617-svxpb6kuqfhjm8oa
2014-04-14 10:26:17 +02:00
Christophe Simonis 3a7e003656 [MERGE] forward port of branch saas-3 up to revid 9394 chs@openerp.com-20140410103638-x7vajn70ewsfp0ck
bzr revid: chs@openerp.com-20140410110424-enhdg6pufhii56ni
2014-04-10 13:04:24 +02:00
chm@openerp.com 3993d1ce2f [FIX] website: snippet parallax. Error when the user activate a snippet parallax already inserted
bzr revid: chm@openerp.com-20140409072813-43fqwcr7j6i0zl0e
2014-04-09 09:28:13 +02:00
chm@openerp.com 5c5a3c4887 [FIX] website: snippet parallax
bzr revid: chm@openerp.com-20140408154926-dq4k4bvmfaq2r6rl
2014-04-08 17:49:26 +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
chm@openerp.com d15ba59a23 [IMP] website: media editor: placeholder and preview
bzr revid: chm@openerp.com-20140408093648-zcx3nj5k068ejrb4
2014-04-08 11:36:48 +02:00
chm@openerp.com a247efb0e4 [FIX] website: media editor fix saved trigger
bzr revid: chm@openerp.com-20140407163337-3a3d3kt5l2nmm3gn
2014-04-07 18:33:37 +02:00
chm@openerp.com 078914371c [FIX] website: save jquery transform style
bzr revid: chm@openerp.com-20140407133750-he0iaor008hvzfim
2014-04-07 15:37:50 +02:00
chm@openerp.com ad93089bc2 [FIX] website: snippet editor add class from li[data-value]
bzr revid: chm@openerp.com-20140407111506-jemffxbanul2yqbk
2014-04-07 13:15:06 +02:00
chm@openerp.com c7a16d134b [FIX] website: media editor, editor position
bzr revid: chm@openerp.com-20140407102419-u5lrqefulj7c8ta0
2014-04-07 12:24:19 +02:00
chm@openerp.com e0d33ad3c5 [FIX] website editor: shop tour and media editor for field image
bzr revid: chm@openerp.com-20140331133340-vj67s9hlptum0h19
2014-03-31 15:33:40 +02:00
chm@openerp.com e81c205b18 [FIX] website: snippet: link carousel-control
bzr revid: chm@openerp.com-20140331130304-v1winnhp41agb030
2014-03-31 15:03:04 +02:00
chm@openerp.com 655142b04b [IMP] website: media editor: add search result for images
bzr revid: chm@openerp.com-20140331120906-0qqa40xbvek27z4j
2014-03-31 14:09:06 +02:00
chm@openerp.com 1c4b7e9f6f [FIX] website: snippet slider slide button
bzr revid: chm@openerp.com-20140331115139-oa8va3ceikgc5b8w
2014-03-31 13:51:39 +02:00
chm@openerp.com 4281a3f89f [FIX] website: snippet typo of resize button
bzr revid: chm@openerp.com-20140331101043-0mf3c6pndz133huy
2014-03-31 12:10:43 +02:00
chm@openerp.com fa6cb6d6a2 [FIX] website media editor button position
bzr revid: chm@openerp.com-20140331100110-ue68pnnzaxusfu1u
2014-03-31 12:01:10 +02:00
chm@openerp.com f97a237b4b [WIP] website: media editor
bzr revid: chm@openerp.com-20140331095253-zftyl4uvd56mpovj
2014-03-31 11:52:53 +02:00
chm@openerp.com e94c9eea4e [WIP] website: media editor
bzr revid: chm@openerp.com-20140331081027-v1eikz3ei78xjjqz
2014-03-31 10:10:27 +02:00
chm@openerp.com 1a33fb64d5 [WIP] website: media editor
bzr revid: chm@openerp.com-20140328154715-alyj4kh33w6v8pgm
2014-03-28 16:47:15 +01:00
chm@openerp.com 31269ba52f [IMP] website: media editor doubleclick for video and begin to use snippet builder
bzr revid: chm@openerp.com-20140328141619-x9okgixai2v5dekr
2014-03-28 15:16:19 +01:00
chm@openerp.com e5f645df4d [FIX] website: snippet editor: forward port of branch saas-3
bzr revid: chm@openerp.com-20140324145416-qn2fvylylxtgu39a
2014-03-24 15:54:16 +01:00
chm@openerp.com 5692dbdb5e [IMP] website: Building block / Snippet Editor
Add documentation and clean framework
The building blocks appear in the edit bar website. These prebuilt html block allowing the designer to easily generate content on a page (drag and drop).
Options allow snippets to add customizations party html code according to their selector (jQuery) and javascript object.

bzr revid: chm@openerp.com-20140324135220-j0abaam1n4ue03l7
2014-03-24 14:52:20 +01:00
chm@openerp.com 449ca3ab18 [IMP] website snippet: add example in documentation
bzr revid: chm@openerp.com-20140324135013-1fr3kznkw29wvca2
2014-03-24 14:50:13 +01:00
Christophe Simonis d93b79e6f4 [MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
2014-03-24 14:38:11 +01:00
chm@openerp.com ba55fcf1d0 [IMP] website: Building block / Snippet Editor
Add documentation and clean framework
The building blocks appear in the edit bar website. These prebuilt html block allowing the designer to easily generate content on a page (drag and drop).
Options allow snippets to add customizations party html code according to their selector (jQuery) and javascript object.

bzr revid: chm@openerp.com-20140324130119-xbnejtayna8haykk
2014-03-24 14:01:19 +01:00
Denis Ledoux 30853afd18 [FIX] website: prevent animations in edit mode
bzr revid: dle@openerp.com-20140321150800-q8p8hn8a7aozcya4
2014-03-21 16:08:00 +01:00
Christophe Simonis 99a3c45976 [MERGE] forward port of branch saas-3 up to revid 9328 chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
bzr revid: chs@openerp.com-20140318132741-aur3q1k7t9iympri
2014-03-18 14:27:41 +01:00
chm@openerp.com 1395c9ee0e [IMP] website: snippet editor: change size automatic button into a cross between resize handler
bzr revid: chm@openerp.com-20140318130414-yb29wtm7oo4bammz
2014-03-18 14:04:14 +01:00
chm@openerp.com d87bc392ce [IMP] website snippet option: rename data-class into data-value
bzr revid: chm@openerp.com-20140317144254-18cscu2yx5thmb89
2014-03-17 15:42:54 +01:00
chm@openerp.com 8820d9f188 [FIX] website: can't edit baner image. Add contentEditable on image tag.
bzr revid: chm@openerp.com-20140314143049-8sp1q32i4x4q76ga
2014-03-14 15:30:49 +01:00
chm@openerp.com 51a0bb001b [IMP] website snippet: add onfocus, onblur, onclone and onremove on snippet options; fix banner id
bzr revid: chm@openerp.com-20140314113510-dqj70i85z41q5j0k
2014-03-14 12:35:10 +01:00
chm@openerp.com 9496d823e9 [FIX] website: snippet dropdown options
bzr revid: chm@openerp.com-20140313130556-u3m9gbdjwi0zo2v1
2014-03-13 14:05:56 +01:00
chm@openerp.com d6fc0c259e [FIX] website: snippet overlay position
bzr revid: chm@openerp.com-20140312130939-6k15igo39ybuu81s
2014-03-12 14:09:39 +01:00
chm@openerp.com 4d125a3b52 [IMP] website: simplify code share button; wip: fix overlay
bzr revid: chm@openerp.com-20140312093440-4uzrpkguzu0fc5p5
2014-03-12 10:34:40 +01:00
chm@openerp.com 53f59c16d6 [MERGE] from trunk
bzr revid: chm@openerp.com-20140311154616-tb35jfweo3xuzqws
2014-03-11 16:46:16 +01:00
chm@openerp.com e5f1cb5a4e [FIX] website: allow fixed size of a slider with 3 slides of distinct size => add resize option on slider
bzr revid: chm@openerp.com-20140307132213-tg3jl2mybbpd0kg3
2014-03-07 14:22:13 +01:00
chm@openerp.com 5f3f09329f [IMP] website: snippet : website.snippet.animationRegistry.follow
bzr revid: chm@openerp.com-20140306140323-o2e77a66eu28bddu
2014-03-06 15:03:23 +01:00
chm@openerp.com 73446943f5 [FIX] website snippet: clean_for_save; display email in subscribe snippet
bzr revid: chm@openerp.com-20140306134746-oi0p580c3s3t2a24
2014-03-06 14:47:46 +01:00