Fabien Meghazi
8435da41bc
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140325103928-ja3bqy6xmyp91gva
2014-03-25 11:39:28 +01:00
Fabien Meghazi
27f38edb25
[FIX] dirty saas-3 fix for url lang switching with model converters
...
bzr revid: fme@openerp.com-20140325100722-temaci88fowcr2m5
2014-03-25 11:07:22 +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
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
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
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
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
79e1813d6e
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140314151011-xhhsovbsg1r0sbwk
2014-03-14 16:10:11 +01:00
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
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
10af6ef168
[rev] website: remove js fix from this branch
...
bzr revid: chm@openerp.com-20140314142244-efpgx9cohx3k337s
2014-03-14 15:22:44 +01:00
62f0b963af
[ADD] missing css file
...
bzr revid: chm@openerp.com-20140314141910-f19pz5js5yatw2y4
2014-03-14 15:19:10 +01:00
8b94f855b6
[FIX] website theme css
...
bzr revid: chm@openerp.com-20140314134642-2yhbgcd5gxb4xw0r
2014-03-14 14:46:42 +01:00
e9fc839785
[FIX] website: css themes
...
bzr revid: chm@openerp.com-20140313102140-37okt41sx5nchx50
2014-03-13 11:21:40 +01:00
caa33bbbbf
[FIX] website: edit banner image
...
bzr revid: chm@openerp.com-20140313102119-nh6byvyeosqsosfn
2014-03-13 11:21:19 +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
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
0560bd631a
[TYPO] website: snippet Style Readability rename into Narrow
...
bzr revid: chm@openerp.com-20140307132247-k442d541jqti8yqv
2014-03-07 14:22:47 +01:00
e5f1cb5a4e
[FIX] website: allow fixed size of a slider with 3 slides of distinct size => add resize option on slider
...
bzr revid: chm@openerp.com-20140307132213-tg3jl2mybbpd0kg3
2014-03-07 14:22:13 +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
0a85dc580b
[FIX] website tour: change tour to use the features widget instead of the 3 columns one; fix 'Customize banner's text' step.
...
bzr revid: chm@openerp.com-20140307111314-3lklte4vzz8smgc4
2014-03-07 12:13:14 +01:00
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
a0feb7c3c9
[REV] backout xmo@openerp.com-20140303153855-5f2l8v0jq2mgb26f, schemas should not be altered in saas-3
...
bzr revid: xmo@openerp.com-20140304132101-qysq310wp1oo859n
2014-03-04 14:21:01 +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
a99a15c960
[ADD] deduplication of website images being uploaded
...
There is a deduplication in ir.attachment, but it's only for FS-stored content
*and* it only deduplicates storage not models (as there are access rights
issues involved).
The goal here is to always return the same attachment when a user uploads the
exact same image multiple times (because it's simpler or whatever).
Initially tried to use a binary field & digest(), but search() blows up
because it tries to utf-8 encode raw binary data. So use char & hexdigest
instead.
_compute_checksum returns None if the provided attachment data does not look
like a website image attachment.
Unhandled: multiple existing matches, maybe a UNIQUE constraint on the
checksum field would be a good idea just in case.
bzr revid: xmo@openerp.com-20140303153855-5f2l8v0jq2mgb26f
2014-03-03 16:38:55 +01:00
Xavier Morel
ec68d3d8bd
[IMP] don't duplicate website_url function field of attachments
...
bzr revid: xmo@openerp.com-20140303142401-2jaxc3m31tmqw9qa
2014-03-03 15:24:01 +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
Denis Ledoux
70d3570846
[FIX]website: do not send False value to google map api to retrieve the image. Otherwise, you are in the middle of the ocean.
...
bzr revid: dle@openerp.com-20140228170900-lagmopkmkb58exqr
2014-02-28 18:09:00 +01:00
Denis Ledoux
2d903bcbb8
[FIX]website: stop animation on focus (clean fix)
...
bzr revid: dle@openerp.com-20140228163112-hru06zno1sl919uq
2014-02-28 17:31:12 +01:00
Christophe Matthieu
abcd7e4926
[FIX] website snippet: When duplicating a column, the column becomes a col-md-1 instead of keeping existing width
...
bzr revid: chm@openerp.com-20140228132507-0s6y5k3vkbmusvf1
2014-02-28 14:25:07 +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
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
f462d1564f
[FIX] website: bootstrap: Fixed the sliding issue of carousel library in IE9. The transition was not working in any snippet.
...
bzr revid: chm@openerp.com-20140227133347-6pk45n7ibyrx8imf
2014-02-27 14:33:47 +01:00
Xavier Morel
6b857b6eeb
[FIX] whitespace/indent lost by RTE
...
Didn't manage to find RTE settings to avoid losing leading whitespace of
lines, so reindeint arch after doing all integration, right before saving back
to view's field.
* html.fromstring(parser=HTMLParser(remove_blank_text=True) does not seem to
work, so serialize to XML, and parse back with
remove_blank_text. remove_blank_text necessary for lxml's pretty_print to
work correctly.
* pretty_print only & always uses 2 spaces/indent level. Our files (and the
HTML editor's Format button) uses 4 spaces -> need a second pass to double
indents.
bzr revid: xmo@openerp.com-20140227125934-q8j3z440px2ic6kx
2014-02-27 13:59:34 +01:00
Paramjit Singh Sahota
89de7d9f25
[MERGE] Merged lp:~openerp/openobject-addons/saas-3
...
bzr revid: psa@tinyerp.com-20140227114202-g2yw8pmsn4v0lm05
2014-02-27 17:12:02 +05:30
Christophe Matthieu
6a777b9e62
[FIX] website editor: Editor bar is showing border in ie.
...
bzr revid: chm@openerp.com-20140227111726-s1545ii3exjqjkxz
2014-02-27 12:17:26 +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
01a898ab8b
[FIX] website snippet: pointer-ie
...
bzr revid: chm@openerp.com-20140227100917-wq54xrkgii7uhacl
2014-02-27 11:09:17 +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
Denis Ledoux
50ecb598e7
[FIX] website: website settings should inherit of res.config.settings and not base.config.settings, as it create a new page settings, instead of extending one
...
bzr revid: dle@openerp.com-20140226171114-jwthykyud66l7o6x
2014-02-26 18:11:14 +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
Christophe Matthieu
a22379520c
[FIX] website: error managment in ace editor for ie9
...
bzr revid: chm@openerp.com-20140225165720-c451gumsd5mce5ya
2014-02-25 17:57:20 +01:00
Christophe Matthieu
1e2a5ddfa6
[FIX] website: fix for ie: add bootstrap class in website_sale and bind click for editor
...
bzr revid: chm@openerp.com-20140225162136-5xdt7n498qxf9myw
2014-02-25 17:21:36 +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
055f73322d
[FIX] website: 'window.location.origin' is not found in IE browser thats why generated manually.
...
bzr revid: chm@openerp.com-20140224143828-wq1k4931lmmm8leh
2014-02-24 15:38:28 +01:00
Christophe Matthieu
60c75d38bf
[FIX] website placeholder; website_hr_recruitment required for ie
...
bzr revid: chm@openerp.com-20140224142751-7bolxomy2nc717w0
2014-02-24 15:27:51 +01:00
Christophe Matthieu
85d3f2ebf5
[FIX][ADD] Added jquery.placeholder lib. because IE9 is not supporting the placeholders.
...
bzr revid: chm@openerp.com-20140224105958-1dji1sepr6z8dzb2
2014-02-24 11:59:58 +01:00
Pariket Trivedi
467ec6a919
[FIX] Fixed a small problem which falls to load the template in mobile
...
bzr revid: psa@tinyerp.com-20140221131215-nf1y2t3qbeiosujb
2014-02-21 18:42:15 +05:30
Fabien Meghazi