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
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
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
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
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
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
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
8b94f855b6
[FIX] website theme css
...
bzr revid: chm@openerp.com-20140314134642-2yhbgcd5gxb4xw0r
2014-03-14 14:46:42 +01:00
9496d823e9
[FIX] website: snippet dropdown options
...
bzr revid: chm@openerp.com-20140313130556-u3m9gbdjwi0zo2v1
2014-03-13 14:05:56 +01:00
e9fc839785
[FIX] website: css themes
...
bzr revid: chm@openerp.com-20140313102140-37okt41sx5nchx50
2014-03-13 11:21:40 +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
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
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
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
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
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
29faa56d8e
[FIX] website tour
...
bzr revid: chm@openerp.com-20140306161104-39dmtb9mw1crw2sd
2014-03-06 17:11:04 +01:00
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
Richard Mathot (OpenERP)