Commit Graph
1379 Commits
Author SHA1 Message Date
chm@openerp.com 60bdd78706 [IMP] website tour: refactoring and change api for create tour and test
bzr revid: chm@openerp.com-20140320083055-z5ys4oey5brd439v
2014-03-20 09:30:55 +01:00
Parth Gajjar (Open ERP) 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
Parth Gajjar (Open ERP) b8d87606f0 [IMP] added gengo statistics, displayed inprogress elements
bzr revid: pga@tinyerp.com-20140319133121-31umju0ea84sm93y
2014-03-19 19:01:21 +05:30
chm@openerp.com 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
chm@openerp.com 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
Dharmraj Jhala (OpenERP) e07861bb19 [MERGE] with latest trunk addons
bzr revid: dizzy.zala@gmail.com-20140319090139-1eaj26atlah94n7y
2014-03-19 14:31:39 +05:30
chm@openerp.com 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
chm@openerp.com ed2743f755 merge upstream
bzr revid: chm@openerp.com-20140318161114-4t331xpt4xeitgxo
2014-03-18 17:11:14 +01:00
Parth Gajjar (Open ERP) c49befd59f [ADD] added website_gengo module
bzr revid: pga@tinyerp.com-20140318133036-j1hcrz7bybolw44u
2014-03-18 19:00:36 +05:30
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 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
chm@openerp.com abe8e7208e [MERGE] from trunk
bzr revid: chm@openerp.com-20140318102102-ug0ny6q360i4o1e6
2014-03-18 11:21:02 +01:00
Kersten Jeremy 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
Dharmraj Jhala (OpenERP) 3566b69374 [MERGE] with latest trunk addons
bzr revid: dizzy.zala@gmail.com-20140318065716-m8wxkwonpu7gpp3a
2014-03-18 12:27:16 +05:30
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 b8071f8bc7 [MERGE] from trunk
bzr revid: chm@openerp.com-20140317142550-53fky76kjdc04s4h
2014-03-17 15:25:50 +01:00
chm@openerp.com 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
Xavier Morel 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
chm@openerp.com 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
Fabien Meghazi 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
Xavier Morel 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
chm@openerp.com 19aacaaea8 [FIX] website: readability block with container css
bzr revid: chm@openerp.com-20140317114956-j5sqt6flie5fla31
2014-03-17 12:49:56 +01:00
chm@openerp.com 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
chm@openerp.com eddd7884d0 [IMP] website tour: add href when time overlaps
bzr revid: chm@openerp.com-20140317094543-xwxmx63emzn5gmrh
2014-03-17 10:45:43 +01:00
chm@openerp.com 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
chm@openerp.com 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
chm@openerp.com 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
Antony Lesuisse 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
Antony Lesuisse 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
chm@openerp.com 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
chm@openerp.com 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
chm@openerp.com 79e1813d6e [MERGE] from trunk
bzr revid: chm@openerp.com-20140314151011-xhhsovbsg1r0sbwk
2014-03-14 16:10:11 +01:00
chm@openerp.com 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
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 10af6ef168 [rev] website: remove js fix from this branch
bzr revid: chm@openerp.com-20140314142244-efpgx9cohx3k337s
2014-03-14 15:22:44 +01:00
chm@openerp.com 62f0b963af [ADD] missing css file
bzr revid: chm@openerp.com-20140314141910-f19pz5js5yatw2y4
2014-03-14 15:19:10 +01:00
chm@openerp.com 8b94f855b6 [FIX] website theme css
bzr revid: chm@openerp.com-20140314134642-2yhbgcd5gxb4xw0r
2014-03-14 14:46:42 +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 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
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 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
chm@openerp.com e9fc839785 [FIX] website: css themes
bzr revid: chm@openerp.com-20140313102140-37okt41sx5nchx50
2014-03-13 11:21:40 +01:00
chm@openerp.com caa33bbbbf [FIX] website: edit banner image
bzr revid: chm@openerp.com-20140313102119-nh6byvyeosqsosfn
2014-03-13 11:21:19 +01:00
Xavier Morel b1cd54f5e9 [FIX] CSS of link style pane
bzr revid: xmo@openerp.com-20140313093822-kpkufmmya0e21my2
2014-03-13 10:38:22 +01:00
Xavier Morel cd0434fb2a [IMP] context-sensitivity of toolbar commands (kinda, attempted)
bzr revid: xmo@openerp.com-20140313093707-gpaz7gmsd5zt2ck5
2014-03-13 10:37:07 +01:00
Xavier Morel 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
chm@openerp.com 4093259ec2 [WIP] website: fix css layout for themes
bzr revid: chm@openerp.com-20140312175519-o1ld0jo983ao7aaa
2014-03-12 18:55:19 +01:00
Xavier Morel 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
chm@openerp.com d6fc0c259e [FIX] website: snippet overlay position
bzr revid: chm@openerp.com-20140312130939-6k15igo39ybuu81s
2014-03-12 14:09:39 +01:00