pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,678 Commits 1 Branch 0 Tags
beb12f71f17cfb2dea0e52cf2e4c863da4bfcc86
Commit Graph
1386 Commits
Author SHA1 Message Date
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
Denis Ledoux 3742b1ab3f [FIX] website: jquery attrbutes assignation is not supported by Firefox 
Happens when trying to change an image in a a banner block
 2014-06-17 15:43:56 +02:00
Xavier Morel dda18249c0 [FIX] @groups attribute should not disappear when editing 
The @groups attribute in qweb views was not rendered (even when matched by the
user), so editing a template with an @groups would either remove the whole
section (if the user didn't have the groups, fixed in previous commit) or only
removed the attribute itself making it visible to everybody (which ought be
fixed-ish by this commit).
 2014-06-17 12:22:15 +02:00
Xavier Morel 79e10200d5 [IMP] prevent edition of page if groups which current user doesn't have 
If the current view uses @groups attributes (possibly in called templates),
the corresponding elements are rendered to a void (empty string in qweb). If
said user can edit the page, does so and saves a view section in which there's
a @groups to which he has no access, the element[@groups] is completely
removed from the template once saved, losing it.

If QWeb encounters an @groups to which the current user has no right during
rendering, have it request a no-RTE page, so the user can not RTE-edit the
page (or drop snippets in it).
 2014-06-17 12:01:52 +02:00
Christophe Matthieu 3d66fff4d4 [FIX] website: clean for save of snippet editor don't remove conteneteditable attributes 2014-06-16 11:47:28 +02:00
Franck Bret e932ecb9df Use encodeURIComponent in place of encodeURI for website new page title, in order to escape special chars like question mark 2014-06-11 10:40:31 +02:00
Christophe Simonis a7c2125735 [MERGE] forward port of branch saas-4 up to 6b8e972 2014-06-10 13:15:46 +02:00
Christophe Simonis 6b8e9727e5 [MERGE] forward port of branch saas-3 up to 4601d85 2014-06-10 12:29:47 +02:00
Denis Ledoux 4b884ed100 [FIX] website: on adding a slide to slider, new slide is last on save 
Before, the new slide was set as first slide
Moreover, the indicators were not correct neither
 2014-06-05 18:58:01 +02:00
Xavier Morel fcb82dc5f1 [IMP] add XID to view name in Ace editor dropdown 
When looking for template bit to override or alter (in-core) through the Ace
editor, displaying only the name is a pain:

- the name generally sucks diseased donkey balls
- having to go through the code to find out what the template's XID is is a
  waste of time
 2014-06-05 13:10:48 +02:00
Olivier Dony 04211015fc [MERGE] Forward-port of latest saas-4 fixes, up to 0452851 2014-05-27 20:49:49 +02:00
Xavier Morel e06f5b414b [IMP] inherit_option_id -> application 2014-05-27 12:13:51 +02:00
Xavier Morel d67161b649 [IMP] renamed some stuff for clarity 2014-05-27 11:57:06 +02:00
Richard Mathot b4c47bcf85 [FIX] website: SEO js 2014-05-26 09:43:01 +02:00
Richard Mathot e01725d15a [FIX] website: SEO promote box 2014-05-26 08:53:54 +02:00
Richard Mathot e28c810123 [FIX] website: convert non-standard HTML metatag to data attribute 2014-05-26 08:51:38 +02:00
Christophe Simonis a756b82372 [MERGE] forward port of branch saas-4 up to revid bb26dea 2014-05-20 20:19:55 +02:00
rim-odoo d3beae2921 [FIX] website: make sure the hidden properties on website will not be overwritten by other properties 2014-05-16 12:19:32 +02:00
Fabien Pinckaers 106abb6496 [FIX] css edit menu alignment and fix of / handling 
bzr revid: fp@tinyerp.com-20140511154058-kj8nn9fdl3li9nzi
 2014-05-11 17:40:58 +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 74a6bde093 [MERGE] from trunk 
bzr revid: chm@openerp.com-20140505134608-hqcmqyo3d98y851j
 2014-05-05 15:46:08 +02:00
Fabien Meghazi b0cbaf330a [IMP] website: load website.xml templates only in editable mode 
bzr revid: fme@openerp.com-20140505113800-wv5vh802us270oez
 2014-05-05 13:38:00 +02:00
chm@openerp.com 939b2f2d44 [FIX] website_sale & tour 
bzr revid: chm@openerp.com-20140502155124-98xz2b4gd2zzzrkx
 2014-05-02 17:51:24 +02:00
Fabien Pinckaers b5209451cd [IMP] Lossless PNG compression. Reduced size by 3 with pngquant 
bzr revid: fp@tinyerp.com-20140501161452-0pw17e2v0cjjlupm
 2014-05-01 18:14:52 +02:00