pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,505 Commits 1 Branch 0 Tags
cb0987889c8f04810a998388b2d8204458bd5708
Commit Graph
1705 Commits
Author SHA1 Message Date
Christophe Simonis 57168a9e90 [MERGE] forward port of branch saas-6 up to a669433 2015-09-23 14:34:26 +02:00
Denis Ledoux a3648fd23a [MERGE] forward port of branch 8.0 up to aabbdc7 2015-09-21 16:01:58 +02:00
Christophe Matthieu e8b57c1457 [FIX] website: addapt tour rte_translator wait for page load 
Next steps executed before the next page loading could cause a test
false positive. Remove hack and use waitFor and WaitNot.
 2015-09-21 13:45:36 +02:00
Nicolas Lempereur a473e425b2 [FIX] website: tour rte_translator wait for page load 
Next steps executed before the next page loading could cause a test
false positive.
 2015-09-18 13:29:48 +02:00
Nicolas Lempereur 3c39b62bce [FIX] website: escaping and external iframe 
jQuery has a special behaviour when using .contents() over an iframe
object. This caused an error for escaping when saving the page with an
iframe content of an external domain.

introduced by 8c77c711
opw-649570
 2015-09-18 09:41:32 +02:00
qsm-odoo f22686fb4d [FIX] website: published/unpublished button + useless code 
For some strange reason, two CSS rules had different priorities between
firefox and chrome (which forced chrome to always display published and
unpublished at the same time).

The chosen solution is to change the value of the button in published/
unpublished instead of toggling and relying on CSS classes (with this
method, the DOM looks better too).

There was also duplicated code in website for assets_backend.
 2015-09-15 13:17:43 +02:00
Jeremy Kersten ac8e28405d [FIX] website: website.theme.js make it re-usable and more flexible 
Each theme was duplicating this file.
Now we need to improve this file to be re-usable by others themes.

This fix is only to catch input, in case of the selector is an image.
 2015-09-14 16:30:39 +02:00
Nicolas Lempereur e03d64cfaa [FIX] website: remove cancelled request for mobile preview 
In 7d40a7d, f820c07, 3ed0628 the way the mobile preview iframe is set
was altered several times. This left an inconsistent needless page load.

This page load was cancelled, but as a side effect in a given set of
conditions:

- an ajax request is done early in current (and so iframe) page,
- phantomjs is used for the test,
- server response time

this could lead to a false positive caused by a cancelled xhr request
throwing the error: "Can't load template, http status 0".
 2015-09-14 10:13:25 +02:00
Jeremy Kersten 8f97374842 [FIX] website: fix translation - missing escaping 2015-09-07 18:07:34 +02:00
Simon Lejeune ef3d0d87bc [FIX] web_planner: tooltip on progress bar 2015-09-07 13:36:12 +02:00
Aaron Bohy 7d1590ef33 [FIX] web_planner: detach on close 2015-09-07 12:15:44 +02:00
Christophe Simonis 3bb0cb2a50 [MERGE] forward port of branch 8.0 up to 9c8b99a 2015-09-04 18:30:48 +02:00
Nicolas Lempereur 6672e45ba4 [FIX] website: better text node if delete and whitespace 
If the node is a text node containing only empty space, we must replace
some of these space by an   so it can be selected.
 2015-09-04 11:35:11 +02:00
Jeremy Kersten 443447a2b1 [FIX] website: set oe_manipulators at top of top-bar 
Without this, oe_manipulator could be under the bar and so impossible to move, duplicate, delete, ... the snippet
 2015-09-03 13:18:52 +02:00
Nicolas Lempereur ea07b7dc2b [FIX] website: don't escape if embedded html field 
We should escape arch ir.ui.view arch content, but we should not escape
embedded html field content.
 2015-09-02 18:36:19 +02:00
Christophe Simonis ea5520967e [FIX] website: handle "DELETE" correctly on mac 2015-08-31 18:57:04 +02:00
Christophe Simonis f22f6954eb [FIX] website: summernote: do not use magic variable "event" 2015-08-31 18:54:55 +02:00
Yannick Tivisse 42141a5b59 [IMP] website: WidgetWebsiteButton: Add label on website below the publication status 2015-08-31 12:58:44 +02:00
Fabien Pinckaers 276065b3f8 [IMP] tour css glitch 2015-08-30 15:21:38 +02:00
Jeremy Kersten b86d98de24 [IMP] website: imp snippet bar 
Force fa size to 14px, to avoid that themes which change body size,
change the fa snippet icon size and display it on severals lines.

Add text 'Snippets are loading' while snippets template is downloading.
 2015-08-29 12:16:48 +02:00
Christophe Simonis edeceba7df [MERGE] forward port of branch saas-6 up to 7a768a4 
Due to `sale` rewrite (94716a3f14),
the commit 503820acb6 has been partially
ignored (in sale.order.line) and will be rewritten later using new-api.
 2015-08-28 15:07:16 +02:00
Christophe Simonis 6d85a9a4b9 [MERGE] forward port of branch 8.0 up to d744923 2015-08-27 18:30:46 +02:00
Christophe Matthieu 46de6789c6 [FIX] website: computeFonts when mediaEditor is called 2015-08-27 18:09:39 +02:00
Christophe Matthieu 877f38e2be [FIX] website: history buttons "undo", "redo" for embedded editor 
* use summernote base history when not editing the website,
* fix the history buttons "undo", "redo" for embedded editor,
 2015-08-27 18:09:39 +02:00
Christophe Matthieu a1194b2bb8 [FIX] website: use and improve ctrl-z/v in forum 
* fix erroneous paste edge case,
* improve selection and pasting
* delete and backspace with hr

opw-646222
 2015-08-27 18:09:39 +02:00
Nicolas Lempereur 8c77c711ee [FIX] website: escaping saved html content 
Escape text nodes changed via the web editor before sending the content
it to the server controller.

It is done since the content is unescaped one time when being displayed,
and it is not done for inline style and script tags (which may be
injected by dropping a snippet) since that would break them.

replacing the solution in cdb900044.
 2015-08-27 17:27:39 +02:00
Jeremy Kersten 11d09a427f [FIX] website: editor - don't try to load ico and video in only_images mode 2015-08-26 15:33:35 +02:00
Christophe Matthieu b44749f8d5 [IMP] website.theme: add event into the on_select arguments to allow the prevent default 2015-08-26 15:31:28 +02:00
Simon Lejeune 5c374313f6 [REF] planner: back again in a modal 
fp's request
 2015-08-26 14:53:00 +02:00
Christophe Matthieu b90c663702 [FIX] website: two sliders or galleries can have the same id 
(because the user can edit separate part like footer or using versioning)

Backport of 394a0c8bb4.
 2015-08-25 17:14:55 +02:00
Christophe Simonis 88c0ce0692 [MERGE] forward port of branch saas-6 up to e16d495 2015-08-24 18:19:19 +02:00
Christophe Matthieu 41e730cbfa [IMP] web_editor: add document into the media editor 
User can upload documents and add the link in the page to download it.
 2015-08-21 22:06:52 +02:00
Christophe Matthieu d4bae06d08 [IMP] web: use css to display attachment mimetype 
Widgets and website display images or display the type with icon like pdf, doc...
 2015-08-21 22:06:52 +02:00
Christophe Simonis b2062df319 [MERGE] forward port of branch 8.0 up to 86f98d5 2015-08-21 17:01:17 +02:00
Christophe Matthieu ee0fd9765e [IMP] website: add on_select on Theme object 
Called by click or changes with enable or disable.
Called only one time by selection.
Receive all changed inputs.
For e.g.: allow to the designer to use this method to open modal or other option.
 2015-08-21 16:01:00 +02:00
Christophe Matthieu 86696c3d70 [FIX] website: can't add a slide in banner 2015-08-21 15:58:53 +02:00
Christophe Matthieu 394a0c8bb4 [FIX] website: two sliders or galleries can have the same id 
(because the user can edit separate part like footer or using versioning)
 2015-08-21 15:58:53 +02:00
Christophe Matthieu a38e5bee18 [FIX] website: zero index for snippet gallery 2015-08-21 15:58:53 +02:00
Nicolas Lempereur 57c00ebea5 [FIX] website: escape when in a modal don't close editor 
When a bootstrap modal is closed via the escape key, the editor would
snatch this keydown event and think we want to stop the editing.
 2015-08-21 15:58:52 +02:00
Nicolas Lempereur ca9f0f283b [FIX] website: remove remnants of video autoplay 
Video autoplay was removed in commit 9069d0 (december 2014) but there
was still two needless references.
 2015-08-21 15:58:52 +02:00
Nicolas Lempereur 0ddb68be81 [FIX] website: manage css margin for resizing 
In some case margin could be applied via CSS and not via mb* classes
(e.g several themes with different aspects but a shared snippet). This
commit allow this if custom CSS margin matches a CSS mb* class value
(currently 0, 4, 8, 16, 32, 48, 92 and 128).
 2015-08-21 15:58:52 +02:00
Nicolas Lempereur 681195a53e [FIX] website: edge case for slider background 
Update the snippet option background "target" and cached
"background data" each time another slide is shown.
 2015-08-21 15:58:52 +02:00
Nicolas Lempereur 0934fcc9ad [FIX] website: improve font awesome icons 
* don't duplicate fa classes needlessly,
* keep img-* classes which may be used on icons with a background,
* copy overlay when we transform a tag to a span
 2015-08-21 15:58:52 +02:00
Christophe Matthieu f52c046afe [FIX] website: snippet editor call on_clone & on_remove on children 2015-08-21 15:58:52 +02:00
Christophe Matthieu 0c1f6f7092 [FIX] website: double enter in blockquote & pre = new line outside 2015-08-21 15:58:52 +02:00
Christophe Matthieu dd4566de37 [FIX] website: remove col-md-12 obsolete bootstrap fix 2015-08-17 10:13:00 +02:00
Christophe Matthieu 384d717dcd [FIX] website: remove col-md-12 obsolete bootstrap fix 2015-08-17 10:12:15 +02:00
Christophe Simonis 73e652818b [MERGE] forward port of branch saas-6 up to 8d95f6d 2015-08-15 16:57:35 +02:00
qsm-odoo 532d4243a6 [IMP] web, website: Split base.xml into base.xml/base_common.xml 
This allows to always have the templates in base_common.xml in the
frontend.
 2015-08-14 13:56:51 +02:00
Antony Lesuisse 4feb82dd49 [REM] website: kanban helper 
website_project has been removed and this helper is now useless.
 2015-08-14 13:33:31 +02:00