Christophe Matthieu
c3d2540477
[FIX] website.editor: must display link information in linkdialox box. Remove /page/ and /page/website. from the needle to search page and apply real url as filter after the search
2014-08-20 17:54:10 +02:00
Christophe Matthieu
37c4bd96c1
[FIX] website.snippet: before the save of the view clean_for_save is called. The option marginAndResize (called by twitter) try to bind events on the overlay but the builder don't load the overlay (for time perf). The fix set a default jquery empty div to avoid the error.
2014-08-20 17:54:10 +02:00
Christophe Matthieu
d12974eee3
[FIX] website.snippet: can't edit website with firefox; remove firefox attr for media video is edit mode
2014-08-20 17:54:10 +02:00
Denis Ledoux
1bb219907f
[MERGE] forward port of branch saas-5 up to 655a5b9
2014-08-04 16:56:10 +02:00
Denis Ledoux
655a5b948d
[MERGE] forward port of branch saas-4 up to 8c0c743
2014-08-04 16:14:31 +02:00
Christophe Matthieu
8d53c357ba
Merge pull request #1428 from odoo-dev/sass-5-fixes-chm
...
[FIX] website_sale and point_of_sale fixes
2014-08-04 14:43:54 +02:00
Jeremy Kersten
28e62e46b5
[FIX] website: use internal route for SEO suggest keyword, old server is down
2014-08-04 12:25:59 +02:00
Christophe Matthieu
9bf1203c33
[FIX] website: the media video create by the media editor is not display in firefox. change the css to display the video and add z-index to the div for edit mode
2014-08-01 11:54:39 +02:00
Christophe Simonis
fd4fd35e32
[MERGE] forward port of branch saas-5 up to e4cb520
2014-07-30 20:52:14 +02:00
Christophe Simonis
e4cb5202a0
[MERGE] forward port of branch saas-4 up to fa07bc8
2014-07-30 20:30:14 +02:00
Olivier Dony
57352367dc
[IMP] website: disable translations for example URLs
2014-07-30 13:24:39 +02:00
Denis Ledoux
88c022dfc8
[MERGE] forward port of branch 7.0 up to bbb8d8f25a
2014-07-29 11:42:10 +02:00
Jeremy Kersten
89e8626ab0
[FIX] website: catch exception on destroy of ckeditor to allow the modifications to be saved anyway
2014-07-24 18:12:32 +02:00
Christophe Matthieu
0a13d8f1db
[FIX] website.snippet: display snippet editor button inline insead of 2 lines for the small boxes
2014-07-23 16:21:53 +02:00
rlu-odoo
8b67a7202d
[REF] OpenERP --> Odoo in various UI texts
...
Rebranding has been done in:
- data/demo files
- html templates
- help notices
- comments
- logger messages
- and other various messages
(Commit taken from odoo-dev:8.0-improve-openerp-odoo-rlu at rev 7deaa08)
Closes #1260
2014-07-18 13:45:41 +02:00
Christophe Matthieu
9b8e307eb1
Merge pull request #1143 from odoo-dev/8.0-fix-website_sale-chm
...
[FIX] website_sale: fiscal_position is undefined; website: add user into the tour logs
2014-07-14 12:10:03 +02:00
Christophe Matthieu
bd11d32694
[FIX] website: banner is broken if more than one on a banner page
2014-07-11 14:06:33 +02:00
Christophe Matthieu
a72bdcca90
[FIX] website: add forgotten button type (btn-success) for link editor
2014-07-11 13:38:57 +02:00
Christophe Matthieu
aca1865654
[FIX] website.seo: regexp doesn't match the object and object id
2014-07-11 11:33:18 +02:00
Christophe Matthieu
1eee1d2c51
[IMP] website: replace the select box into dropdown for link editor to have a preview
2014-07-11 11:09:24 +02:00
Christophe Matthieu
67e15d8d86
[FIX] web: update bootstrap to version 3.2.0; add bootstrap less files
2014-07-10 16:59:31 +02:00
Christophe Matthieu
886d6101ac
[IMP] website editor: change link editor modal layout
2014-07-10 15:25:44 +02:00
Christophe Matthieu
0effbe3ca6
[FIX] website: enumarate page raise an exception if query_string is not null; Can't create a page with the modal link editor
2014-07-10 14:30:15 +02:00
Christophe Matthieu
c2c0fdc916
[IMP] website editor: remove button style from cke and insert into the link dialog box. Fix the dialog box label value when the user create a link.
2014-07-10 13:34:02 +02:00
Christophe Matthieu
ca02d8820a
[FIX] website: customize menu stay empty if it's open to quick. Don't throw an exception when the tour have an error: log error and close tour.
2014-07-02 13:54:57 +02:00
Simon Lejeune
186b56519d
Merge remote-tracking branch 'odoo/master' into master-allow-translate-on-noedit-sle
2014-07-01 17:17:40 +02:00
Simon Lejeune
95446047ee
[IMP] website translator: allow to translate a page even when you can't edit it
2014-07-01 17:02:04 +02:00
Christophe Matthieu
6a2f3e2c2a
[IMP] tour.js: raise an error when phantomjs run a tour and an other running tour has been detected.
2014-07-01 13:37:41 +02:00
Antony Lesuisse
4bc43e6ac2
[FIX] website snippet editor initialisation
2014-06-29 04:01:24 +02:00
Simon Lejeune
195fa93168
[MERGE] backend front end integration
...
Render the top-menu (backend menu or frontend editbar) server-side.
Use Fontawesome icons (mail, timezone, chat).
Refactor website widgets, split Website.editorBarin editorbar, ace, editorbar- content, editorbarCustomize.
2014-06-27 11:03:34 +02:00
Antony Lesuisse
893aace122
[MERGE] website_sale optional-products
2014-06-26 12:31:15 +02:00
Christophe Matthieu
77a07670cf
[IMP] website: move custom scripts in the assets; fix website_sale_option to display modal in grid view
2014-06-25 14:03:23 +02:00
Christophe Simonis
1eaa69d342
[MERGE] forward port of branch saas-5 up to 9e8e365
2014-06-25 12:44:13 +02:00
Christophe Simonis
9e8e3653f2
[MERGE] forward port of branch saas-4 up to f68c835
2014-06-25 12:43:41 +02:00
Simon Lejeune
478a763cac
[MERGE] manual merge of latest bootswatch minified stylesheets
2014-06-24 11:48:49 +02:00
Jeremy Kersten
2b44ac2cd6
[MERGE] Gengo - Merge saas-4-gengo-jke - Fix gengo to make it working
2014-06-23 12:22:25 +02:00
Jeremy Kersten
18bb52ee88
[FIX] Gengo - Update modoel ir_translation for gengo and make it working. Works with order and not job, because when you send a batch to translate, you don't know all the job but only the order.
2014-06-20 17:33:09 +02:00
Christophe Matthieu
5165b52b43
merge upstream
2014-06-19 18:46:49 +02:00
Christophe Matthieu
2d686988a4
[FIX] tour.js: forgotten backdrop and orphan css
2014-06-19 17:52:32 +02:00
Christophe Simonis
eef6330c55
[MERGE] forward port of branch saas-5 up to adf07a9
2014-06-19 16:23:32 +02:00
Christophe Simonis
adf07a9490
[MERGE] forward port of branch saas-4 up to 5087612
2014-06-19 16:13:35 +02:00
Christophe Simonis
5087612d1d
[MERGE] forward port of branch saas-3 up to bf53aed
2014-06-19 15:44:07 +02:00
Paramjit Singh Sahota
5023816c55
[FIX] website: correct selector
...
The selector to toggle the theme was triggered too often (on almost each button) but had no effect because no view-id was present.
Patch fix #627
2014-06-19 14:45:56 +02:00
Xavier Morel
ab1406cd7c
[FIX] website: ignore SVG elements when looking for edition events in RTE
2014-06-19 11:39:14 +02:00
Christophe Matthieu
bc3fc54fac
[IMP] Tour: add tour in web module; tour became available in backend.
2014-06-18 12:25:13 +02:00
Thibault Delavallée
916a79184b
Merge pull request #610 from odoo-dev/saas-5-mass-mailing-fixes-tde
...
[FIX] mass_mailing, website: fixed unsubscription link, fixed mobile preview of email designer crashing because of the redirection not taking search parameters
2014-06-18 11:52:04 +02:00
Thibault Delavallée
1de1b3c272
[FIX] website: mobile preview should keep the current search; some pages depends strongly of the url parameters, notably the email designer page.
2014-06-18 11:26:55 +02:00
xmo-odoo
3160eb74c4
Merge pull request #584 from xmo-odoo/master-qweb-groups-xmo
...
`@groups` attribute in qweb views
2014-06-18 09:37:02 +02:00
xmo-odoo
8482632c9b
Merge pull request #354 from xmo-odoo/editor-xmlid
...
[IMP] add XID to view name in Ace editor dropdown
2014-06-17 16:24:04 +02:00
Xavier Morel
00c2644783
[IMP] display view's XID *below* the selection
...
* Looks better
* Allows for a label
* Allows for longer template names and ids without cutting off
* Room to grow more info bits
2014-06-17 16:22:28 +02:00