Xavier Morel
e06f5b414b
[IMP] inherit_option_id -> application
2014-05-27 12:13:51 +02:00
Christophe Simonis
b8089a1521
[MERGE] forward port of branch saas-4 up to revid 9410 chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1
...
bzr revid: chs@openerp.com-20140507170112-bjeltv2b0coy60am
2014-05-07 19:01:12 +02:00
chm@openerp.com
3f032f3f97
[FIX] website editor: background image
...
bzr revid: chm@openerp.com-20140505150722-gwewelvu3uv6joen
2014-05-05 17:07:22 +02:00
chm@openerp.com
ee7ff4bd07
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140423154852-gzegxqrzb2sj01zl
2014-04-23 17:48:52 +02:00
Thibault Delavallée
d264cd1640
[IMP] website_mail: make the template / mail editor work. We now have a limited
...
set of fields that we try to edit (body_html and body for body, email_from and email for
email-from, name and subject for subject), because t-field is not dynamic. If the model
that should be edited does not hold those fields, the mail editor won't work.
Also fixed editor not being actiated when going into the body edition.
bzr revid: tde@openerp.com-20140416105901-vavkh9erjsq4mof9
2014-04-16 12:59:01 +02:00
chm@openerp.com
3f7e567acc
[FIX] website
...
bzr revid: chm@openerp.com-20140414081451-0hzjgaewtcok6rod
2014-04-14 10:14:51 +02:00
chm@openerp.com
81f2c983e5
[IMP] website: media editor: change button on keyup
...
bzr revid: chm@openerp.com-20140408094703-7qayghtm88qku3jz
2014-04-08 11:47:03 +02:00
chm@openerp.com
d15ba59a23
[IMP] website: media editor: placeholder and preview
...
bzr revid: chm@openerp.com-20140408093648-zcx3nj5k068ejrb4
2014-04-08 11:36:48 +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
a247efb0e4
[FIX] website: media editor fix saved trigger
...
bzr revid: chm@openerp.com-20140407163337-3a3d3kt5l2nmm3gn
2014-04-07 18:33:37 +02:00
chm@openerp.com
153e31d754
[FIX] website: media editor: add image with topbar
...
bzr revid: chm@openerp.com-20140407144914-50wblp9teywr8wk2
2014-04-07 16:49:14 +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
chm@openerp.com
cdf4636dce
[IMP] website: media editor: remove previous and next button for picto
...
bzr revid: chm@openerp.com-20140407081751-upxilacnt4szk4s6
2014-04-07 10:17:51 +02:00
chm@openerp.com
2f7950f19f
[IMP] website: media editor: insert add button for video loader
...
bzr revid: chm@openerp.com-20140407081159-434frpfqhe1zqrc0
2014-04-07 10:11:59 +02:00
chm@openerp.com
ee4b879536
[IMP] website: media editor: insert add button for image loader and fix try_remove don't remove image
...
bzr revid: chm@openerp.com-20140407074922-zri6j4u9sw52nkkw
2014-04-07 09:49:22 +02:00
chm@openerp.com
26d62c4e55
[IMP] website: media editor: add feedback when the user try to remove a picture
...
bzr revid: chm@openerp.com-20140407073247-davv0udxz5n5qx35
2014-04-07 09:32:47 +02:00
chm@openerp.com
583a47b7b9
[IMP] website: media editor: add embed video
...
bzr revid: chm@openerp.com-20140331135558-ulr1nzhwwvcnwswm
2014-03-31 15:55:58 +02:00
chm@openerp.com
e0d33ad3c5
[FIX] website editor: shop tour and media editor for field image
...
bzr revid: chm@openerp.com-20140331133340-vj67s9hlptum0h19
2014-03-31 15:33:40 +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
655142b04b
[IMP] website: media editor: add search result for images
...
bzr revid: chm@openerp.com-20140331120906-0qqa40xbvek27z4j
2014-03-31 14:09:06 +02: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
b0625b1191
[IMP] website: add video media editor
...
bzr revid: chm@openerp.com-20140328104453-2faynhhc1wi5598l
2014-03-28 11:44:53 +01:00
chm@openerp.com
e289e23298
[WIP] website media editor
...
bzr revid: chm@openerp.com-20140327171417-nz2cd8tn2dmmljge
2014-03-27 18:14:17 +01:00
chm@openerp.com
c8d0175e61
[IMP] website media editor: change template
...
bzr revid: chm@openerp.com-20140327160324-yb1cwpsgqymxsf83
2014-03-27 17:03:24 +01:00
chm@openerp.com
c15e5b5163
[WIP] website media editor
...
bzr revid: chm@openerp.com-20140327105103-r4laze34bf0z62o2
2014-03-27 11:51:03 +01:00
chm@openerp.com
9bb510938f
[WIP] website: media editor for image
...
bzr revid: chm@openerp.com-20140326160701-6wf21suhkv4rimyw
2014-03-26 17:07:01 +01:00
chm@openerp.com
a7dc05bf6e
[WIP] website: add media editor template
...
bzr revid: chm@openerp.com-20140326155822-f4wascgyrm7ffeg8
2014-03-26 16:58:22 +01:00
Fabien Meghazi
eb5cbea318
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140326152433-vegu5tuvr8vc1s8v
2014-03-26 16:24:33 +01:00
chm@openerp.com
368bf4dff6
[FIX] website editor: color of style button
...
bzr revid: chm@openerp.com-20140326143655-33sm4i67zjn03o2c
2014-03-26 15:36:55 +01:00
chm@openerp.com
aa63c56462
[IMP] website editor: add style button on image
...
bzr revid: chm@openerp.com-20140326141629-diz4rk0789no7yyl
2014-03-26 15:16:29 +01:00
Fabien Meghazi
0fe55dddc1
[IMP] Added a mimetype field in ir.attachment
...
bzr revid: fme@openerp.com-20140325160413-jvxjii6rbqcrjxor
2014-03-25 17:04: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
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
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
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
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
chm@openerp.com
8df09c6c6a
[FIX] website: snippet: display image editor button in snippet. Don't remove overlay (editor is used to clean snippets for save view)
...
bzr revid: chm@openerp.com-20140305132422-sfmlq8giol53rqjm
2014-03-05 14:24:22 +01:00
Xavier Morel
e78a3b18cc
[ADD] tentative removal of attachments
...
Attachments ought be removed only if they are not used in an existing page/web
view.
Theoretically this could be set directly in unlink(), but:
* that would make a nice error message significantly harder
* the expenses of performing a text search in all view archs would be a bit expensive
Notes:
* the views set could be reduced to only "web" views
* the search is likely sensible to false negatives e.g. different order of
query parameters. It *will* remove images still being used.
bzr revid: xmo@openerp.com-20140304110716-u14w6uo8fbkfa42i
2014-03-04 12:07:16 +01:00
Xavier Morel
9d00835b2c
[FIX] order of attachments in 'existing images' sub-dialog: put last uploaded first
...
bzr revid: xmo@openerp.com-20140303135426-evouhwgjtwku3v2b
2014-03-03 14:54:26 +01:00
Christophe Matthieu
d96cf8c54c
[FIX] website: editor: can not edit a label in edit mode, must prevent the default click
...
bzr revid: chm@openerp.com-20140227140043-8iko13704pci9823
2014-02-27 15:00:43 +01:00
Christophe Matthieu
5f70ca61b6
[FIX] website: editor: pointer-events:none for ie doesn't work (because ie). Change snippet overlay to fix this ie bug
...
bzr revid: chm@openerp.com-20140227111038-0hodseqys6pnz841
2014-02-27 12:10:38 +01:00
Christophe Matthieu
cfeac71d6a
[FIX] website: editor: pointer-events:none for ie doesn't work (because ie). Change snippet overlay to fix this ie bug
...
bzr revid: chm@openerp.com-20140226175558-2gyix2zgdawf87yz
2014-02-26 18:55:58 +01:00
Xavier Morel
30a99471e2
[FIX] Webkit created spurious spans with inline style when joining lines
...
Post process to manually unwrap node if it only has purely looks-oriented CSS
properties set inline.
ref:
https://code.google.com/p/chromium/issues/detail?id=226941
https://bugs.webkit.org/show_bug.cgi?id=114791
http://dev.ckeditor.com/ticket/9998
http://www.neotericdesign.com/blog/2013/3/working-around-chrome-s-contenteditable-span-bug
bzr revid: xmo@openerp.com-20140226152004-9ybbki1op80lpxin
2014-02-26 16:20:04 +01:00
Xavier Morel
750b9f405c
[FIX] tags edition breakage in website_event_track
...
* remove some nodes from the $editables set, ``li`` really does not like being
widgetified. Remove a few others just in case
* split fa outside of li to make it safely (ish) editable
* simplify upcast function for icons cke widget
bzr revid: xmo@openerp.com-20140225131228-2m75itgi4zbj5xfh
2014-02-25 14:12:28 +01:00
Christophe Matthieu
a09b0db51d
[FIX] website: Select some text > Click on the link button > Select Page textfield and start typing (e.g. comm) > There is a lot of noise here; Dsiplaying create page for existing page
...
bzr revid: odo@openerp.com-20140219105502-jg8f2i1gpz5vdarf
2014-02-19 11:55:02 +01:00
Christophe Matthieu
42634d2a0d
[FIX] website rte: Select some text > Click on the link button > Start typing > The focus is still on your text, you loose what you selected
...
bzr revid: odo@openerp.com-20140219092402-bf8vkin5q07rv9bf
2014-02-19 10:24:02 +01:00
Christophe Matthieu
1c4f859f1f
[FIX] website: jQuery (sizcache) trigger a change id in the page, the observer set as dirty all template. All template are saved when the user click on save button.
...
bzr revid: chm@openerp.com-20140218160144-5drlsnz4plyb9tqx
2014-02-18 17:01:44 +01:00