1c4b7e9f6f
[FIX] website: snippet slider slide button
...
bzr revid: chm@openerp.com-20140331115139-oa8va3ceikgc5b8w
2014-03-31 13:51:39 +02:00
4281a3f89f
[FIX] website: snippet typo of resize button
...
bzr revid: chm@openerp.com-20140331101043-0mf3c6pndz133huy
2014-03-31 12:10:43 +02:00
fa6cb6d6a2
[FIX] website media editor button position
...
bzr revid: chm@openerp.com-20140331100110-ue68pnnzaxusfu1u
2014-03-31 12:01:10 +02:00
f97a237b4b
[WIP] website: media editor
...
bzr revid: chm@openerp.com-20140331095253-zftyl4uvd56mpovj
2014-03-31 11:52:53 +02:00
e94c9eea4e
[WIP] website: media editor
...
bzr revid: chm@openerp.com-20140331081027-v1eikz3ei78xjjqz
2014-03-31 10:10:27 +02:00
ff1588a46d
[IMP] added new supportable languages, bog solved in config dialog, improved count words dialog
...
bzr revid: pga@tinyerp.com-20140331070625-qtr7l45lnca5rfze
2014-03-31 12:36:25 +05:30
c4896f801c
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140331041956-0ots0gkn1d4ffudq
2014-03-31 09:49:56 +05:30
f1131d547b
[IMP] flat design, even for darken
...
bzr revid: fp@tinyerp.com-20140329125635-3ext2zt4y9n2cpua
2014-03-29 13:56:35 +01:00
1a33fb64d5
[WIP] website: media editor
...
bzr revid: chm@openerp.com-20140328154715-alyj4kh33w6v8pgm
2014-03-28 16:47:15 +01:00
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
3de6738dbb
merged with trunk addons
...
bzr revid: pga@tinyerp.com-20140328131822-0kc0f5j5qhupkhbr
2014-03-28 18:48:22 +05:30
b0625b1191
[IMP] website: add video media editor
...
bzr revid: chm@openerp.com-20140328104453-2faynhhc1wi5598l
2014-03-28 11:44:53 +01:00
e63646130e
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140328042815-kv5qmuh2wxdt9wwp
2014-03-28 09:58:15 +05:30
e289e23298
[WIP] website media editor
...
bzr revid: chm@openerp.com-20140327171417-nz2cd8tn2dmmljge
2014-03-27 18:14:17 +01:00
c8d0175e61
[IMP] website media editor: change template
...
bzr revid: chm@openerp.com-20140327160324-yb1cwpsgqymxsf83
2014-03-27 17:03:24 +01:00
cf311bda60
[MERGE] remote module import
...
bzr revid: fme@openerp.com-20140327141233-i7xu8ism7howhflv
2014-03-27 15:12:33 +01:00
2de4260240
merged with trunk-addons
...
bzr revid: pga@tinyerp.com-20140327113805-2ie66rru6o10nv38
2014-03-27 17:08:05 +05:30
c15e5b5163
[WIP] website media editor
...
bzr revid: chm@openerp.com-20140327105103-r4laze34bf0z62o2
2014-03-27 11:51:03 +01:00
740e35e56d
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140327094902-nko6rc1cs97b4sd1
2014-03-27 10:49:02 +01:00
c1b6589851
[IMP] website_event: widget to promote Events with country flag
...
bzr revid: chm@openerp.com-20140327093517-8ppcxypc6krxc2fi
2014-03-27 10:35:17 +01:00
9bb510938f
[WIP] website: media editor for image
...
bzr revid: chm@openerp.com-20140326160701-6wf21suhkv4rimyw
2014-03-26 17:07:01 +01:00
a7dc05bf6e
[WIP] website: add media editor template
...
bzr revid: chm@openerp.com-20140326155822-f4wascgyrm7ffeg8
2014-03-26 16:58:22 +01:00
eb5cbea318
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140326152433-vegu5tuvr8vc1s8v
2014-03-26 16:24:33 +01:00
368bf4dff6
[FIX] website editor: color of style button
...
bzr revid: chm@openerp.com-20140326143655-33sm4i67zjn03o2c
2014-03-26 15:36:55 +01:00
aa63c56462
[IMP] website editor: add style button on image
...
bzr revid: chm@openerp.com-20140326141629-diz4rk0789no7yyl
2014-03-26 15:16:29 +01:00
b39be63a8b
[IMP] website: fix and add rotationStep option for jsuery transfo
...
bzr revid: chm@openerp.com-20140326124339-ll12dxd2qyo3gpi3
2014-03-26 13:43:39 +01:00
473243270b
[MERGE] merged with trunk addons
...
bzr revid: pga@tinyerp.com-20140326112709-m1iqkkmjt1xtmio1
2014-03-26 16:57:09 +05:30
26692117b6
[ADD] website: add jQuery.transfo.js to transform dom (rotation, scale, translate)
...
bzr revid: chm@openerp.com-20140326105345-rq58x39zl6wi6a7s
2014-03-26 11:53:45 +01:00
864892d6ce
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140326054841-9yoaub8fw058vjkm
2014-03-26 11:18:41 +05:30
0fe55dddc1
[IMP] Added a mimetype field in ir.attachment
...
bzr revid: fme@openerp.com-20140325160413-jvxjii6rbqcrjxor
2014-03-25 17:04:13 +01:00
f76a734e90
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140325114109-lts5z42lq9xlgqx0
2014-03-25 17:11:09 +05:30
13d7cfe86c
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140324082341-d6gqyloc7822aen2
bzr revid: chm@openerp.com-20140325084852-i1yomuyhyen4ss95
2014-03-25 09:48:52 +01:00
fa46f255f2
[IMP] wording
...
bzr revid: fp@tinyerp.com-20140324203540-rx76yaqaw3p9aql9
2014-03-24 21:35:40 +01:00
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
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
449ca3ab18
[IMP] website snippet: add example in documentation
...
bzr revid: chm@openerp.com-20140324135013-1fr3kznkw29wvca2
2014-03-24 14:50:13 +01:00
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
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
bf0d35dbdd
[IMP] merged gengo translator with main translator, removed 'Restart Job' from wizard,removed constraint from base_gengo
...
bzr revid: pga@tinyerp.com-20140324103631-j4cswrlk5huuibt5
2014-03-24 16:06:31 +05:30
aa9387e845
[FIX] don't mark view sections as dirty just because the snippets thing has inserted drop zones in it
...
bzr revid: xmo@openerp.com-20140324101850-el3cfs0x4uln3u7v
2014-03-24 11:18:50 +01:00
843ac33ad9
[IMP] clean css
...
bzr revid: fp@tinyerp.com-20140322185641-qy57fotd1uvztffy
2014-03-22 19:56:41 +01:00
30853afd18
[FIX] website: prevent animations in edit mode
...
bzr revid: dle@openerp.com-20140321150800-q8p8hn8a7aozcya4
2014-03-21 16:08:00 +01:00
ac8babe0e5
[IMP] minor changes
...
bzr revid: pga@tinyerp.com-20140320120758-ojgqpqb8sakdhkbb
2014-03-20 17:37:58 +05:30
e45d9bc7b0
[IMP] removed unnecessary code
...
bzr revid: pga@tinyerp.com-20140320094434-4zp7x6dmd27wfza2
2014-03-20 15:14:34 +05:30
a378f547f4
[IMP] minor changes
...
bzr revid: pga@tinyerp.com-20140320092643-1pw62dmbj9h6sjh4
2014-03-20 14:56:43 +05:30
b7a68828ed
[IMP] improved statistics, added sendbox options for testing, improved UI
...
bzr revid: pga@tinyerp.com-20140320071028-adyh8d89o7dij81o
2014-03-20 12:40:28 +05:30
b8d87606f0
[IMP] added gengo statistics, displayed inprogress elements
...
bzr revid: pga@tinyerp.com-20140319133121-31umju0ea84sm93y
2014-03-19 19:01:21 +05:30
00aa1b69dc
[FIX] website tour: don't hide error in test mode if openerp don't exist
...
bzr revid: chm@openerp.com-20140319102348-rb1tkgd14nca6o15
2014-03-19 11:23:48 +01:00
b80d06d327
[FIX] website tour: reset tour before console.log 'ok' or 'error' who close phantomjs tour
...
bzr revid: chm@openerp.com-20140319092012-v83w99ts6z0apgl0
2014-03-19 10:20:12 +01:00
e07861bb19
[MERGE] with latest trunk addons
...
bzr revid: dizzy.zala@gmail.com-20140319090139-1eaj26atlah94n7y
2014-03-19 14:31:39 +05:30
a762af1f21
[FIX] website_sale: payment get status url (ending slash); fix debbuger template url scripts
...
bzr revid: chm@openerp.com-20140319085700-b4v9iu51a9jtzty3
2014-03-19 09:57:00 +01:00
ed2743f755
merge upstream
...
bzr revid: chm@openerp.com-20140318161114-4t331xpt4xeitgxo
2014-03-18 17:11:14 +01:00
c49befd59f
[ADD] added website_gengo module
...
bzr revid: pga@tinyerp.com-20140318133036-j1hcrz7bybolw44u
2014-03-18 19:00:36 +05:30
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
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
f9579073fe
[FIX] website: color of Edit Master link for themes. CSS less specific
...
bzr revid: chm@openerp.com-20140318111442-mbrhrmtnwy3uxc5y
2014-03-18 12:14:42 +01:00
abe8e7208e
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140318102102-ug0ny6q360i4o1e6
2014-03-18 11:21:02 +01:00
77622d3b24
[FIX] Fix css which make unusable the option dropdown for unpublished product. When an user was hover on a product not published and was trying to go in submenu, he had lost cursor, because he was changing div due to opacoty little than 1.
...
bzr revid: jke@openerp.com-20140318092341-ncgb173y0xfiaj87
2014-03-18 10:23:41 +01:00
3566b69374
[MERGE] with latest trunk addons
...
bzr revid: dizzy.zala@gmail.com-20140318065716-m8wxkwonpu7gpp3a
2014-03-18 12:27:16 +05:30
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
b8071f8bc7
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140317142550-53fky76kjdc04s4h
2014-03-17 15:25:50 +01:00
d3111df3aa
[FIX] website: The user does not see the content menu because of the tutorial is hover
...
bzr revid: chm@openerp.com-20140317141324-th65fhx512h2p1fa
2014-03-17 15:13:24 +01:00
cd4f83122a
[FIX] reduce span of paragraph spacer thing to not break layout
...
bzr revid: xmo@openerp.com-20140317135144-hvuxshfp4cjudnbh
2014-03-17 14:51:44 +01:00
25732de9ce
[FIX] website tour: typo for banner (from usertest feedback)
...
bzr revid: chm@openerp.com-20140317133700-8xrneej6aytua4j4
2014-03-17 14:37:00 +01:00
4c5d238191
[FIX] website translation won't properly find inherited view's id
...
bzr revid: fme@openerp.com-20140317132416-nu10ltrskc8d0orf
2014-03-17 14:24:16 +01:00
d3c7750b96
[FIX] inject WORD JOINER inside p so they don't seemingly disappear after saving
...
bzr revid: xmo@openerp.com-20140317124056-kg2jngp2mg769v7m
2014-03-17 13:40:56 +01:00
19aacaaea8
[FIX] website: readability block with container css
...
bzr revid: chm@openerp.com-20140317114956-j5sqt6flie5fla31
2014-03-17 12:49:56 +01:00
44bebab682
[FIX] website: typo: message let the user think that he can change the mobile view while he cannot
...
bzr revid: chm@openerp.com-20140317114938-3ghhwm0km3u5wyu1
2014-03-17 12:49:38 +01:00
eddd7884d0
[IMP] website tour: add href when time overlaps
...
bzr revid: chm@openerp.com-20140317094543-xwxmx63emzn5gmrh
2014-03-17 10:45:43 +01:00
89eb355069
[FIX] website tour: create a stub for bootstrap tour in automatic/test mode (need for full test and hide real bug for tour test)
...
bzr revid: chm@openerp.com-20140317083442-imylv9v5fafjxhwr
2014-03-17 09:34:42 +01:00
83f4c339b7
[IMP] website: tour: create a stub for bootstrap tour in automatic/test mode (because no need all time, and hide sometime the real bug)
...
bzr revid: chm@openerp.com-20140317080313-e8uern0s3wwua52h
2014-03-17 09:03:13 +01:00
6fc418883e
[FIX] website: route and redirect: remove all backslash from url
...
bzr revid: chm@openerp.com-20140317080145-6l5mk4q05uf639li
2014-03-17 09:01:45 +01:00
c93b466d32
[FIX] website tour, prepare for manual injection
...
- reorder website.js in a choerent way
- remove injectable website.tour.test.js
We will do injection manually using website.inject_tour, in the mean time only
non injection test are supported, fully disable test needing inject, until fme
merge its fix.
bzr revid: al@openerp.com-20140316165442-p82wqwv82559oact
2014-03-16 17:54:42 +01:00
0772c99bcb
[FIX] website test, remove useless test, waitfor banner fix
...
bzr revid: al@openerp.com-20140316144546-agpgmlwxa532xxmb
2014-03-16 15:45:46 +01:00
b220dc926e
[FIX] website: can't see edit button because css with overflow hidden for all tag. Aplly css only on carousel, paralax and blockquote
...
bzr revid: chm@openerp.com-20140314163639-l086jn568rtti5mv
2014-03-14 17:36:39 +01:00
353bbdc2c3
[FIX] website: route and redirect: remove all backslash from url
...
bzr revid: chm@openerp.com-20140314162346-25vohj6ayp65tgiy
2014-03-14 17:23:46 +01:00
79e1813d6e
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140314151011-xhhsovbsg1r0sbwk
2014-03-14 16:10:11 +01:00
264186541b
[IMP] website: remove css .fa and write important in font fa in web branch
...
bzr revid: chm@openerp.com-20140314150446-9g4n4ixws4cedfxp
2014-03-14 16:04:46 +01:00
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
10af6ef168
[rev] website: remove js fix from this branch
...
bzr revid: chm@openerp.com-20140314142244-efpgx9cohx3k337s
2014-03-14 15:22:44 +01:00
62f0b963af
[ADD] missing css file
...
bzr revid: chm@openerp.com-20140314141910-f19pz5js5yatw2y4
2014-03-14 15:19:10 +01:00
8b94f855b6
[FIX] website theme css
...
bzr revid: chm@openerp.com-20140314134642-2yhbgcd5gxb4xw0r
2014-03-14 14:46:42 +01:00
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
aa412d99ec
[FIX] website tour: create a stub for bootstrap tour in automatic/test mode
...
bzr revid: chm@openerp.com-20140313142258-wblpqpwp9oubboc9
2014-03-13 15:22:58 +01:00
9496d823e9
[FIX] website: snippet dropdown options
...
bzr revid: chm@openerp.com-20140313130556-u3m9gbdjwi0zo2v1
2014-03-13 14:05:56 +01:00
2390c9179b
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140312140429-4x94dc1x70yfik1w
bzr revid: chm@openerp.com-20140313122048-1zrqhq6dbtv8jpad
2014-03-13 13:20:48 +01:00
e9fc839785
[FIX] website: css themes
...
bzr revid: chm@openerp.com-20140313102140-37okt41sx5nchx50
2014-03-13 11:21:40 +01:00
caa33bbbbf
[FIX] website: edit banner image
...
bzr revid: chm@openerp.com-20140313102119-nh6byvyeosqsosfn
2014-03-13 11:21:19 +01:00
b1cd54f5e9
[FIX] CSS of link style pane
...
bzr revid: xmo@openerp.com-20140313093822-kpkufmmya0e21my2
2014-03-13 10:38:22 +01:00
cd0434fb2a
[IMP] context-sensitivity of toolbar commands (kinda, attempted)
...
bzr revid: xmo@openerp.com-20140313093707-gpaz7gmsd5zt2ck5
2014-03-13 10:37:07 +01:00
0308b7968c
[IMP] don't allow HTML formatting in non-HTML fields
...
bzr revid: xmo@openerp.com-20140313093202-02s734ucabvkckli
2014-03-13 10:32:02 +01:00
4093259ec2
[WIP] website: fix css layout for themes
...
bzr revid: chm@openerp.com-20140312175519-o1ld0jo983ao7aaa
2014-03-12 18:55:19 +01:00
8ad325614d
[FIX] sprurious widgetification and editability of icon elements
...
* tighten widget match: don't match elements with .fa which are also "view
section" roots (~ editing hosts) as the classes themselves out not be
editable and the result will thus be odd
* correspondingly, only associate the icon "change" button to instances of the
``icons`` widget, other elements bearing ``.fa`` are not editable and should
be excluded.
bzr revid: xmo@openerp.com-20140312141910-a2apy22qj4wwxsne
2014-03-12 15:19:10 +01:00
d6fc0c259e
[FIX] website: snippet overlay position
...
bzr revid: chm@openerp.com-20140312130939-6k15igo39ybuu81s
2014-03-12 14:09:39 +01:00
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
53f59c16d6
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140311154616-tb35jfweo3xuzqws
2014-03-11 16:46:16 +01:00
d504764eff
[MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
...
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
2014-03-11 15:52:05 +01:00
3ceefde489
[FIX] website editor: check if link and fa is editable and display change button
...
bzr revid: chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
2014-03-11 14:08:52 +01:00
8694a48ef1
[IMP] website: use mailto for share snippet insead of mail form
...
bzr revid: chm@openerp.com-20140310141947-zs9ltuzx48k5ej5x
2014-03-10 15:19:47 +01:00
7e8b25dbee
[IMP] website: create share snippet. TODO: controller to send mail or mailto href
...
bzr revid: chm@openerp.com-20140310135434-7xt2sy89if9116l3
2014-03-10 14:54:34 +01:00
chm@openerp.com
Parth Gajjar (Open ERP)
ajay javiya (OpenERP)
Fabien Pinckaers
Fabien Meghazi
Christophe Simonis
Xavier Morel
Denis Ledoux
Dharmraj Jhala (OpenERP)
Kersten Jeremy
Antony Lesuisse