Commit Graph

753 Commits

Author SHA1 Message Date
Fabien Meghazi 4c24985289 [ADD] alternate hreflang links in head for search engines
cf: https://support.google.com/webmasters/answer/189077?hl=en

bzr revid: fme@openerp.com-20140509122400-49sl631mwipx1039
2014-05-09 14:24:00 +02:00
Fabien Meghazi ee1fbd17c8 [FIX] jQuery.ui - boostrap conflict
bzr revid: fme@openerp.com-20140506153335-x2fwpajvthcru1cv
2014-05-06 17:33:35 +02:00
Antony Lesuisse 7e25b9ae55 [MERGE] saas-4 report_webkit missing dependency on report
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
Fabien Meghazi 46b422def0 [REM] useless id's in script and links
bzr revid: fme@openerp.com-20140430073104-qwb0opveyx5hnplg
2014-04-30 09:31:04 +02:00
Fabien Meghazi a1d3b7d9ad [REM] duplicates in assets
bzr revid: fme@openerp.com-20140430072102-2nzi1lcm95exb6v4
2014-04-30 09:21:02 +02:00
Fabien Meghazi 45aba13ed5 [FIX] bootstrap-tour removed
bzr revid: fme@openerp.com-20140429161604-dq0ny7bjioe6bjg3
2014-04-29 18:16:04 +02:00
Fabien Meghazi b7003a382a [MERGE] upstream
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +02:00
Fabien Meghazi c92e1b6bcb [IMP] Rename assets_frontend
bzr revid: fme@openerp.com-20140429145745-t3u41tzv6qnndlla
2014-04-29 16:57:45 +02:00
Fabien Meghazi fdaa70f319 [REM] language passed as query param for bundles controllers
'translatable' has been removed from assets templates, no need for this anymore

bzr revid: fme@openerp.com-20140428124513-vlbm1hjsv9989den
2014-04-28 14:45:13 +02:00
Fabien Meghazi 6d60aadfb8 [FIX] ace editor can't find it's assets if code is bundled
It's tries to find it's own <script> tag but fail to do so.

bzr revid: fme@openerp.com-20140425130229-koavz642l01txlxn
2014-04-25 15:02:29 +02:00
Fabien Meghazi eae846f2c8 [FIX] remove @translatable conditions and de-activate group_website_designer specifics
Bundlification (and later merge of editor and web client) can't work with conditional
script inclusion

bzr revid: fme@openerp.com-20140425124913-9jsfhbfhoq6j6xxl
2014-04-25 14:49:13 +02:00
Fabien Meghazi 4f16d15120 [IMP] rename editor assets
bzr revid: fme@openerp.com-20140425101753-gz6c8q9huw9c04yp
2014-04-25 12:17:53 +02:00
Christophe Simonis 7a7d7febf8 [MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
Fabien Meghazi 1d8400418e [MERGE] upstream
bzr revid: fme@openerp.com-20140423123744-zfz7k8drn2t624zu
2014-04-23 14:37:44 +02:00
Fabien Meghazi 0ec498371e [FIX] translatable condition on *.editor.js assets
bzr revid: fme@openerp.com-20140422141656-r9cx0z7mkwhe51hp
2014-04-22 16:16:56 +02:00
Xavier Morel 74d4d1f58d [CHG] bundlify website
CKEDITOR_BASEPATH has to be defined, by default ckeditor will load its files
relative to "itself" (the file which executes it). After bundling, the path is
incorrect and ckeditor looks for its files (e.g. en.js) in the wrong place.

bzr revid: xmo@openerp.com-20140418121503-4nsja7enutney2vn
2014-04-18 14:15:03 +02:00
Kersten Jeremy c4164204b5 [FIX] Website - fix path of script watch.js
bzr revid: jke@openerp.com-20140416083411-a06k9sbiyda7zmrd
2014-04-16 10:34:11 +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 9c739f12c2 [FIX] Remove watcher, need to be review because it breaks other tests.
bzr revid: jke@openerp.com-20140414165721-i8g23jxy66p1p6ao
2014-04-14 18:57:21 +02:00
Kersten Jeremy faa899adde [FIX] Reactive watcher
bzr revid: jke@openerp.com-20140414163412-88seef6j58xiamug
2014-04-14 18:34:12 +02:00
Kersten Jeremy 552a23a4bd [FIX] Remove watcher
bzr revid: jke@openerp.com-20140414153537-0qjlnqqnk0q9utn0
2014-04-14 17:35:37 +02:00
Kersten Jeremy a8ce5415ad [FIX] Watch if jQuery is overwritted by another version in some script. If an override is detected, we check that all old function is always present else we add the missing.
The problem was that some websites uses externals libraries which use a jQuery more recent that our version. Jquery by default  checks his own version  and overwrite itself if the current version is lower.
Once user had their jquery overwritted, function dropdown was missing and it was impossible to the end user to get menu working again... and so impossible to remove the view with the front end.

bzr revid: jke@openerp.com-20140414151423-zhi3tjj52rihltzy
2014-04-14 17:14:23 +02:00
chm@openerp.com 1b6585e614 [MERGE] from trunk
bzr revid: chm@openerp.com-20140414081610-h4qzg0okrwrxggar
2014-04-14 10:16:10 +02:00
Richard Mathot (OpenERP) 23abadb62b [MERGE] Sync with trunk
bzr revid: rim@openerp.com-20140411124318-pgxdmjfidsyny2ob
2014-04-11 14:43:18 +02:00
Fabien Pinckaers 63c2093d2c [IMP] Larger texts
bzr revid: fp@tinyerp.com-20140411122232-s8yipnar4tllspm0
2014-04-11 14:22:32 +02:00
chm@openerp.com 1fc8f89bc1 [MERGE] from trunk
bzr revid: chm@openerp.com-20140411082050-lr7vtew6yvsqaon6
2014-04-11 10:20:50 +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
Richard Mathot (OpenERP) e29174090a [MERGE] Sync with trunk
bzr revid: richard_mathot_openerp-20140409194248-ii36xsv0lpr68rmt
2014-04-09 21:42:48 +02:00
chm@openerp.com 15c035631d [MERGE] from trunk
bzr revid: chm@openerp.com-20140409154520-eddr2h21bei95xxu
2014-04-09 17:45:20 +02:00
chm@openerp.com f090689984 [FIX] website: The separator block is not working (no drop zone)
bzr revid: chm@openerp.com-20140409140733-ne0frg4o7b3c1lr0
2014-04-09 16:07:33 +02:00
chm@openerp.com 4347df6e4d [FIX] website: Default Url not correct for the button 'contact us' in the block features>Button
bzr revid: chm@openerp.com-20140409134143-aoiqbd2aqe78hgyc
2014-04-09 15:41:43 +02:00
chm@openerp.com 88eaa5f26f [IMP] website: remove transform in modile view and change order menu
bzr revid: chm@openerp.com-20140409124321-cwu86whebzuwtz1e
2014-04-09 14:43:21 +02:00
chm@openerp.com 673dc5b1d7 [MERGE] from trunk
bzr revid: chm@openerp.com-20140408132412-7ofhd87laj3uoazj
2014-04-08 15:24:12 +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 df92252952 [FIX] website media editor: next previous
bzr revid: chm@openerp.com-20140408084237-y8yh8cb1gsv94gbo
2014-04-08 10:42:37 +02:00
chm@openerp.com 781e8fbbf0 [IMP] website: add Rounded Border, Box, Circle, Shadow to transform snippet
bzr revid: chm@openerp.com-20140408082649-1z79gagload02ol0
2014-04-08 10:26:49 +02:00
chm@openerp.com be5fe933ec [MERGE] from trunk
bzr revid: chm@openerp.com-20140408080736-6b70rlfsvj3to0od
2014-04-08 10:07:36 +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
Richard Mathot (OpenERP) deae95f6af [MERGE] Sync with trunk
bzr revid: rim@openerp.com-20140402073422-u3ysvtln130z0kbr
bzr revid: rim@openerp.com-20140403084250-a3d5vmnsya7jx1qe
bzr revid: rim@openerp.com-20140407073946-nx1648yopw91m7v8
2014-04-07 09:39:46 +02:00
Fabien Pinckaers de380aa914 [IMP] button snippet
bzr revid: fp@tinyerp.com-20140406132519-eookdnec20c6sg20
2014-04-06 15:25:19 +02:00
Fabien Meghazi 00803fd13a [ADD] website: template reset confirmation
bzr revid: fme@openerp.com-20140401094233-9zcuc915l56a7h1h
2014-04-01 11:42:33 +02:00
Richard Mathot (OpenERP) f07e0ff8c5 [MERGE] Sync with trunk
bzr revid: rim@openerp.com-20140401071752-mdhg7kjdhgvju1cb
2014-04-01 09:17:52 +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 880ac90e1b [MERGE] from trunk
bzr revid: chm@openerp.com-20140331121654-jsdotezdyi9qwmeb
2014-03-31 14:16:54 +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
Fabien Pinckaers fd43cecbda [REM] remove duplicate snippet: portfolio - image gallery
bzr revid: fp@tinyerp.com-20140330190548-cmgypctw8ymzs4yf
2014-03-30 21:05:48 +02:00
Fabien Pinckaers 2478af1b16 [IMP] better button snippet
bzr revid: fp@tinyerp.com-20140329192911-i75v53f0gos8fybm
2014-03-29 20:29:11 +01:00
Fabien Pinckaers f1131d547b [IMP] flat design, even for darken
bzr revid: fp@tinyerp.com-20140329125635-3ext2zt4y9n2cpua
2014-03-29 13:56:35 +01: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 99ac3ff81b [MERGE] from trunk
bzr revid: chm@openerp.com-20140326105539-9hf1x7u6lvh2hq2f
2014-03-26 11:55:39 +01:00
chm@openerp.com 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
Richard Mathot (OpenERP) 6e25b1fc3f [MERGE] Sync with trunk
bzr revid: rim@openerp.com-20140325152935-hifgmzdl63yhmkll
2014-03-25 16:29:35 +01:00
Richard Mathot (OpenERP) 631532072d [MERGE] Sync with trunk
bzr revid: rim@openerp.com-20140325085451-rscgni01o54123fm
2014-03-25 09:54:51 +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 9556cadbff [MERGE] trunk
bzr revid: sle@openerp.com-20140324162043-dzdwcxdt32sfjy57
2014-03-24 17:20:43 +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 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
chm@openerp.com 429324999c [IMP] website tour: remove tag script and css to lib bootstrap
bzr revid: chm@openerp.com-20140321112344-mwh2p8pp02j9sdq0
2014-03-21 12:23:44 +01:00
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
Richard Mathot (OpenERP) ecc7c1fbd3 [MERGE] Sync with trunk
bzr revid: rim@openerp.com-20140319072330-lvlrxsqq667hfu28
2014-03-19 08:23:30 +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
Richard Mathot (OpenERP) 39f3264e53 [MERGE] Sync with trunk
bzr revid: rim@openerp.com-20140318075419-qkw5odjmgi58n0rj
2014-03-18 08:54:19 +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
Richard Mathot (OpenERP) 04e2c89c62 [MERGE] Sync with trunk
bzr revid: rim@openerp.com-20140315102709-3zp27g8lyr3z36d1
2014-03-15 11:27:09 +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 8b94f855b6 [FIX] website theme css
bzr revid: chm@openerp.com-20140314134642-2yhbgcd5gxb4xw0r
2014-03-14 14:46:42 +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 e9fc839785 [FIX] website: css themes
bzr revid: chm@openerp.com-20140313102140-37okt41sx5nchx50
2014-03-13 11:21:40 +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
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 384f398090 [IMP] website: publish button use action for url to backend
bzr revid: chm@openerp.com-20140311171941-1fwhholwlsuncjyh
2014-03-11 18:19:41 +01:00
chm@openerp.com 53f59c16d6 [MERGE] from trunk
bzr revid: chm@openerp.com-20140311154616-tb35jfweo3xuzqws
2014-03-11 16:46:16 +01:00
Christophe Simonis 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
chm@openerp.com 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
chm@openerp.com 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 0560bd631a [TYPO] website: snippet Style Readability rename into Narrow
bzr revid: chm@openerp.com-20140307132247-k442d541jqti8yqv
2014-03-07 14:22:47 +01:00
Kersten Jeremy 9f23642476 [FIX] Change 'Administration' to 'My Account' to switch between website and portal - backend and frontend
bzr revid: jke@openerp.com-20140307131017-nhqlnhnsgeprtblc
2014-03-07 14:10:17 +01:00
chm@openerp.com 29faa56d8e [FIX] website tour
bzr revid: chm@openerp.com-20140306161104-39dmtb9mw1crw2sd
2014-03-06 17:11:04 +01:00
chm@openerp.com 58a5f90758 [IMP] website: dynamic website_mail snippet with js
bzr revid: chm@openerp.com-20140306130240-cpsd5mssziuvrpf8
2014-03-06 14:02:40 +01:00
Christophe Matthieu 68749a0683 [IMP] website: snippet: remove data-snippet-id and add auto resize on resising option
bzr revid: chm@openerp.com-20140303142017-jcb3401wpiuvbc1n
2014-03-03 15:20:17 +01:00
Richard Mathot (OpenERP) dbd02d734b [MERGE] Sync with trunk
bzr revid: rim@openerp.com-20140303131137-2shoyv0ywvgp5fx3
2014-03-03 14:11:37 +01:00
Christophe Matthieu 4a80c007e3 [IMP] website: snippet selector
bzr revid: chm@openerp.com-20140303121945-d2ynze1vja5v0d7d
2014-03-03 13:19:45 +01:00
Christophe Matthieu 2569e07191 [IMP] website: snippet don't use snipet id
bzr revid: chm@openerp.com-20140303113946-d70yd8nmew1k3z37
2014-03-03 12:39:46 +01:00
Christophe Matthieu ce1ff0a854 [FIX] website snippet: Fix parallax with retro-compatibility; Crappy fix for carousel because bootstrap active cycling when user click on a bullet and don't stop when user edit a snippet inside a slider.
bzr revid: chm@openerp.com-20140228131738-il41640r8x9zesll
2014-02-28 14:17:38 +01:00
Christophe Matthieu c11f4f9352 [FIX] website: snippet: continue slide cycling when the user edit the content
bzr revid: chm@openerp.com-20140228095531-8c735qyacmffryno
2014-02-28 10:55:31 +01:00
Richard Mathot (OpenERP) ee51fc0ca6 [MERGE] Sync with trunk
bzr revid: rim@openerp.com-20140225093040-6k4kmj93uo2bk6t9
2014-02-25 10:30:40 +01:00
Simon Lejeune 531ab41957 [MERGE] trunk
bzr revid: sle@openerp.com-20140225091121-3cuuiofh2zt923p0
2014-02-25 10:11:21 +01:00
Fabien Pinckaers 2d0db5a8bf [IMP] 3 cols to respect icon and make it easier for new users to start with
bzr revid: fp@tinyerp.com-20140224110148-12lndtuaztxypgmw
2014-02-24 12:01:48 +01:00
Simon Lejeune 7de120a2ef [MERGE] trunk
bzr revid: sle@openerp.com-20140224103630-xxn8l4i7f16dq75w
2014-02-24 11:36:30 +01:00
Fabien Pinckaers 3e31d2cb03 [IMP] Allow to press select where you want the new line
bzr revid: fp@tinyerp.com-20140224095553-qc4lhnpetczl1t7v
2014-02-24 10:55:53 +01:00
Simon Lejeune 65dc368cdd [MERGE] trunk
bzr revid: sle@openerp.com-20140221145952-fh5i7k18egwo3l5t
2014-02-21 15:59:52 +01:00
Christophe Simonis 7e2bf04b4a [FIX] website: bootstrap is now in web module
bzr revid: chs@openerp.com-20140221104725-e1w0t9ety5oqjf0y
2014-02-21 11:47:25 +01:00
Simon Lejeune 35b64811e9 [MERGE] trunk
bzr revid: sle@openerp.com-20140221095425-9043pbzjy7rtbxd1
2014-02-21 10:54:25 +01:00
Christophe Simonis 4b72678bc7 [MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
2014-02-20 17:38:15 +01:00
Richard Mathot (OpenERP) 77e89f6a81 [MERGE] Sync with trunk
bzr revid: rim@openerp.com-20140220120929-lbhrdz5sv190ylhu
2014-02-20 13:09:29 +01:00
Paramjit Singh Sahota e776245b8b [ADD] Added jquery.placeholder lib. because IE9 is not supporting the placeholders.
bzr revid: psa@tinyerp.com-20140220100716-01mjib3w692qdgi1
2014-02-20 15:37:16 +05:30
Christophe Matthieu 09397684b3 [FIX] website: change odrer of script tag because jquery-ui-1.9.1.custom overwrite jQuery and cancel some bootstrap method in edit mode
bzr revid: chm@openerp.com-20140218153451-uxd87o5b7zy3asvv
2014-02-18 16:34:51 +01:00
Christophe Matthieu 00c810ab14 [FIX] website: Don't allow to edit the menu inline. Users try to change the link, but it does not work. We can put a tooltip explaning they should use the content top menu to edit the menu; bootstrap tooltip don't available in edit mode.
bzr revid: chm@openerp.com-20140218145619-fboofhu111s3g45p
2014-02-18 15:56:19 +01:00
Simon Lejeune 47d1019ed0 [MERGE] trunk
bzr revid: sle@openerp.com-20140218140417-lrzzswy31wsjr2py
2014-02-18 15:04:17 +01:00
Christophe Matthieu 8830cb581c [FIX] website: In the footer, users record their phone number inbetween the fa-phone and the t-field. As a result, they change the footer template, not the phone number of the company. This zone should be t-ignore to avoid this mistake.
bzr revid: chm@openerp.com-20140218110250-lvvem8ibkg3g8e8d
2014-02-18 12:02:50 +01:00
Richard Mathot (OpenERP) 0e3c241e66 [IMP] Add url widget in server actions form view
bzr revid: rim@openerp.com-20140218084315-gtutjttm6sx627k1
2014-02-18 09:43:15 +01:00
openerp-sle 2445e9f0bc [MERGE] trunk
bzr revid: openerp-sle@openerp-sle.home-20140216103609-ihf3bz4nf4rds5ue
2014-02-16 11:36:09 +01:00
Christophe Matthieu 5ec3d91cf7 [MERGE] from trunk
bzr revid: chm@openerp.com-20140214133607-0pdcfyxvuqwsway6
2014-02-14 14:36:07 +01:00
openerp-sle e7f03b92c4 [MERGE] trunk
bzr revid: openerp-sle@openerp-sle.home-20140213121633-d1qnw9hsgz2e392d
2014-02-13 13:16:33 +01:00
openerp-sle 0ae6d1f4e7 [FIX] More accurate values for the demo paper format and website contact widget enhanced
bzr revid: openerp-sle@openerp-sle.home-20140213120739-4jh30s94scfr584e
2014-02-13 13:07:39 +01:00
openerp-sle eb4bdb1a49 [IMP] Website: contact widget has now an option to disable fontawesome markers
bzr revid: openerp-sle@openerp-sle.home-20140212220801-66kuwbz8d3piy2sa
2014-02-12 23:08:01 +01:00
Christophe Matthieu ed785f0783 [FIX] website_sale: pager and breadcrum keep search and filter. Filter keep search and category. Links for category
bzr revid: chm@openerp.com-20140212115516-3izdv7cszgh2n3l4
2014-02-12 12:55:16 +01:00
Thibault Delavallée e1e528e19c [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140212103823-aifj3y0dwir0cbyv
2014-02-12 11:38:23 +01:00
Christophe Matthieu ac03ba3095 [FIX] website: pager don't keep searches
bzr revid: chm@openerp.com-20140212102805-5khiv3cgslci9che
2014-02-12 11:28:05 +01:00
Christophe Matthieu 7576c80a36 [FIX] website: Snippet: Move separator to Features instead of Content section
bzr revid: chm@openerp.com-20140211163853-g5a92uuifrv20e20
2014-02-11 17:38:53 +01:00
Christophe Matthieu 712811654a [FIX] website: text-box and image in the banner is too big on large screen. It should be in a 'container'.
bzr revid: chm@openerp.com-20140211143619-b1dwa5q1wdoeyzn4
2014-02-11 15:36:19 +01:00
Richard Mathot (OpenERP) 60e4340cee [MERGE] Merge trunk
bzr revid: rim@openerp.com-20140211133450-itj3p86ptmqtqrjt
2014-02-11 14:34:50 +01:00
Christophe Matthieu 1b52723e97 [IMP] website: remove bootstrap in addons/website and use bootstrap from web
bzr revid: chm@openerp.com-20140211110457-cmqdhbs6wugqt14x
2014-02-11 12:04:57 +01:00
Christophe Matthieu 7d1ba3329c [FIX] website: contactus: address of the company above the phone, typo edit button
bzr revid: chm@openerp.com-20140211095933-s712ssydrv1d54nq
2014-02-11 10:59:33 +01:00
Fabien Pinckaers d31504171c [IMP] Pantone colors of the year
bzr revid: fp@tinyerp.com-20140211085450-ny3pgidw5nobjc5x
2014-02-11 09:54:50 +01:00
Richard Mathot (OpenERP) af58bb70bc [MERGE] Merge trunk
bzr revid: rim@openerp.com-20140211072305-uzc1oocfn4jnuf8i
2014-02-11 08:23:05 +01:00
Frédéric van der Essen 04a6074b1a [MERGE] forward porting fixes from saas-3
bzr revid: fva@openerp.com-20140210155628-75mgw7qcq9k5ncem
2014-02-10 16:56:28 +01:00
Xavier Morel d4c7de4b03 [FIX] work around distribute_branding
distribute_branding is applied after view inheritance is applied, and does not
take it in account. As a result, altering an existing view "from the top"
(e.g. adding a div element preceding an existing div) will alter the xpath
leading to whatever element we need to deal with.

Move fakebar injection to the bottom of the body, where it can't have any
impact on preceding node paths.

bzr revid: xmo@openerp.com-20140210132855-lwh1ow1tq1e0pidp
2014-02-10 14:28:55 +01:00
Richard Mathot (OpenERP) 7b606a662b [MERGE] Sync with trunk
bzr revid: rim@openerp.com-20140210082325-orsule85beliwswl
2014-02-10 09:23:25 +01:00
Antony Lesuisse 87172d90d2 [MERGE] saas-3
bzr revid: al@openerp.com-20140209140315-ukqlf90ngy6ycu2k
2014-02-09 15:03:15 +01:00
Fabien Pinckaers 54beb6d0b8 [IMP] Buttons snippet
bzr revid: fp@tinyerp.com-20140208114750-jgtx0h5oevqjz4zm
2014-02-08 12:47:50 +01:00
Richard Mathot (OpenERP) 1a7d7a3f55 [MERGE] Sync with trunk
bzr revid: rim@openerp.com-20140207163324-0fj6qsqs79bvutx6
2014-02-07 17:33:24 +01:00
Christophe Matthieu 598d811ea7 [MERGE] from saas-3
bzr revid: chm@openerp.com-20140207140912-2tu1bhpvlap0fa4m
2014-02-07 15:09:12 +01:00
Fabien Pinckaers 5f92743b18 [IMP] logo by default (easier to configure)
bzr revid: fp@tinyerp.com-20140207134836-pjub0d84nxmgb560
2014-02-07 14:48:36 +01:00
Christophe Matthieu b21bb08c22 [ADD] website: test login, backend, go back, branding, edit, logout
bzr revid: chm@openerp.com-20140207125231-3zd0i1axdwuht5g4
2014-02-07 13:52:31 +01:00
Thibault Delavallée 167ac762ca [IMP] website: server action: display website_url in tree view
bzr revid: tde@openerp.com-20140207123301-4guyw8ay4e6fghuj
2014-02-07 13:33:01 +01:00
Thibault Delavallée c7b90329cd [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140207121941-hzzbc2qk40ukahvy
2014-02-07 13:19:41 +01:00
Thibault Delavallée 7d696bc620 [IMP] website: server actions: usability improvements
- added website_path, the end of the path to access the server action, allowing more custom
and short URLs, like website/action/partners instead of website/action/website.action_partners;
- added website_url, computed file with the full address of the server action that is displayed
on the form view, to ease usability
- updated server action contorller: now takes xml_id, id, or website_path

bzr revid: tde@openerp.com-20140207121921-7kdpxrf30zlte47l
2014-02-07 13:19:21 +01:00
Christophe Matthieu 22a27ed953 [MERGE] Microformats (microdata) support for improved SEO.
Supported formats:
 - Organization
   https://support.google.com/webmasters/answer/146861?hl=en&ref_topic=1088474
   http://schema.org/Organization
 - Event
   https://support.google.com/webmasters/answer/164506?hl=en&ref_topic=1088474
   http://schema.org/Event
 - Product+Offer
   https://support.google.com/webmasters/answer/146750#offer_properties
   http://schema.org/Product
   http://schema.org/Offer

Tested with http://www.google.com/webmasters/tools/richsnippets

bzr revid: chm@openerp.com-20140207113721-klunj6bf9qp4b2cx
2014-02-07 12:37:21 +01:00
Christophe Matthieu 7f241d4245 [FIX] website: snippet option: background style is required
bzr revid: chm@openerp.com-20140207105722-6wfbfw5mj5937t03
2014-02-07 11:57:22 +01:00
Richard Mathot (OpenERP) 0449c69ec1 [MERGE] Rebasing with trunk
bzr revid: rim@openerp.com-20140207105652-1m00kvul9qh8q42h
2014-02-07 11:56:52 +01:00
Christophe Matthieu e8964f896c [FIX] website: tour, test and test_runner
bzr revid: chm@openerp.com-20140206140746-jmeyx8q9qxv7sz1j
2014-02-06 15:07:46 +01:00
Christophe Matthieu d819d494f1 [IMP] website: add debugger template used to create nex tours/tests (display in customize menu in debug mode)
bzr revid: chm@openerp.com-20140206135036-geq8fubtz39pxp20
2014-02-06 14:50:36 +01:00
Thibault Delavallée a769fb4111 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140206081947-7bf31snu1igkwz5x
2014-02-06 09:19:47 +01:00
Fabien Pinckaers cd4060d373 [IMP] Simplify snippet so that they are useabile out-of-the-box
bzr revid: fp@tinyerp.com-20140205214151-s6narh04xsffjri2
2014-02-05 22:41:51 +01:00
Thibault Delavallée ba962f9b1c [ADD] website: added forgottent view file for ir_actions
bzr revid: tde@openerp.com-20140205123737-o7btwj3xryosnayo
2014-02-05 13:37:37 +01:00
Xavier Morel 18d9e91394 [IMP] make editor bar appear faster to avoid impression of slowness and reflow
bzr revid: xmo@openerp.com-20140204153616-swho76l8v3s4p1dq
2014-02-04 16:36:16 +01:00
ddm@openerp.com 319185a1ed [FIX] Remove redundant microdata
bzr revid: ddm@openerp.com-20140203131454-7h3t2x4ff1z085xi
2014-02-03 14:14:54 +01:00
ddm@openerp.com 0733d51365 [IMP] Organization microdata
bzr revid: ddm@openerp.com-20140203124718-8ogunilwsvm42ikt
2014-02-03 13:47:18 +01:00
Richard Mathot (OpenERP) 7f0c30580b [MERGE] Sync with trunk-website-al
bzr revid: rim@openerp.com-20140131154544-tfcci0uo0q6652jh
bzr revid: rim@openerp.com-20140202135602-82pcqeqqtdp6h9fr
2014-02-02 14:56:02 +01:00
Fabien Meghazi 5451f5587d [REV] Bring back QWebExceptions
bzr revid: fme@openerp.com-20140131113611-wee3xvnvzw9smq2r
2014-01-31 12:36:11 +01:00
Olivier Dony 09d7908b28 [IMP] website themes: simpler wording
bzr revid: odo@openerp.com-20140131084821-703lcteu3ipfoiji
2014-01-31 09:48:21 +01:00
Richard Mathot (OpenERP) 7b70388235 [MERGE] Sync with trunk-website-al
bzr revid: rim@openerp.com-20140131075821-qx8cc0ybtxqr7219
2014-01-31 08:58:21 +01:00
Antony Lesuisse 974c666bcd [REV] website qweb dont change exception types
bzr revid: al@openerp.com-20140131011427-3bome249kut8fs3t
2014-01-31 02:14:27 +01:00
Fabien Meghazi 1931c307a2 [IMP] Improved qweb exeptions handling
bzr revid: fme@openerp.com-20140130212053-fkb9ug49qun54ehi
2014-01-30 22:20:53 +01:00
Fabien Meghazi fc979b9a7a [FIX] url_for()
bzr revid: fme@openerp.com-20140130195043-pkfkmqg80c2yk5p5
2014-01-30 20:50:43 +01:00