Commit Graph

1906 Commits

Author SHA1 Message Date
chm@openerp.com 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
chm@openerp.com 0d4d9af5f4 [FIX] website: fix and activate frontend test
bzr revid: chm@openerp.com-20140325140328-3f5is66d0petqrl6
2014-03-25 15:03:28 +01:00
Fabien Meghazi 329c19f94e [FIX] Fix url slug check bug in multilang=True
bzr revid: fme@openerp.com-20140325140026-0qdx9zl21za8gto9
2014-03-25 15:00:26 +01:00
chm@openerp.com 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
Simon Lejeune 6889165eb1 [MERGE] trunk
bzr revid: sle@openerp.com-20140324164409-452kibtg3l7rd0nj
2014-03-24 17:44:09 +01:00
Simon Lejeune 9556cadbff [MERGE] trunk
bzr revid: sle@openerp.com-20140324162043-dzdwcxdt32sfjy57
2014-03-24 17:20:43 +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
Simon Lejeune 50fda546e2 [REF] Moved qweb contact from website to base and removed the from_html method (it never worked)
bzr revid: sle@openerp.com-20140324135933-f21heo0sz0tzjbv3
2014-03-24 14:59:33 +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
Xavier Morel 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
Simon Lejeune 6b5986e34d [FIX] ir_http website postprocess args: do not redirect if the only difference between the url and the post-processed url is the url-enconding of some characters
bzr revid: sle@openerp.com-20140321120133-0k1zjsrtgwrw6oon
2014-03-21 13:01:33 +01:00
Xavier Morel a56dc53bea [REM] 4-spaces indent for web view pretty-print-before-save routine
Didn't quite work right: on the layout, it would exponentially increase
leading spaces in text nodes. Combined with a bug injecting snippets marks in
the footer (and thus invalidating and re-saving the layout at each snippet
addition) this could blow up the layout template and rendered page to >20MB.

Just keep lxml's standard 2-spaces indent.

LXML is unable to pretty print the layout anyway.

bzr revid: xmo@openerp.com-20140321075419-9w88h232r928xv5f
2014-03-21 08:54: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
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
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
Xavier Morel 5196cd6e8c [FIX] website: set inherit_branding in test contexts to trigger generation of relevant edition attributes
bzr revid: xmo@openerp.com-20140317152502-6a2agi1xjooi516e
2014-03-17 16:25:02 +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 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
Xavier Morel 8ffc4d0a5a [ADD] support for presized fields in website/image
also add presized field to attachments (automatically computed from datas)

bzr revid: xmo@openerp.com-20140317104251-ddsa9cfpq1vkk2k1
2014-03-17 11:42:51 +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
Antony Lesuisse e23ce63133 [FIX] website tests crawler, admin password != super admin password
bzr revid: al@openerp.com-20140316142302-7xm0sputqgadihs0
2014-03-16 15:23:02 +01:00
Fabien Pinckaers d5c63e3205 [MERGE] trunk
bzr revid: fp@tinyerp.com-20140316122101-angijeo5fmr5j8v7
2014-03-16 13:21:01 +01:00
Fabien Pinckaers 675a71b2b8 [IMP] attachments on messages
bzr revid: fp@tinyerp.com-20140316113742-odae0ph3a1qrqn12
2014-03-16 12:37:42 +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 410ec52276 [MERGE] website: add optional 'action' in managment edit button to laod one specific backend view
bzr revid: chm@openerp.com-20140314162909-ff0obqbw6j7lalmz
2014-03-14 17:29:09 +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