pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,060 Commits 1 Branch 0 Tags
ee67d6580110b87d018b40f6ec1e59eb02c19e71
Commit Graph
2264 Commits
Author SHA1 Message Date
Jeremy Kersten 8eb97cc082 [IMP] website_sale: Add google analytics on checkout process 2014-07-09 17:45:40 +02:00
Christophe Matthieu e0ed658044 [FIX] website: if the first menu refered to a website page and the route for this path is overwrited, the route is not used, the template has not the values of the route. (e.g. contact-us menu in first position if website_crm is installed) 2014-07-09 10:39:00 +02:00
Olivier Dony d9cda97cf4 [MERGE] Forward-port saas-4 up to 5ceded9 2014-07-05 01:28:19 +02:00
Olivier Dony 5ceded9d69 [MERGE] Forward-port saas-3 up to 4fa30f5 2014-07-05 01:04:19 +02:00
Martin Trigaux a6bf8cd07b [FIX] website: avoid divisions by zero when no record to display 2014-07-02 16:25:24 +02:00
Jeremy Kersten e77594c3c3 [IMP] website: backport 5112421a (unslug) 
Update the regexp to be not case sensitive
 2014-06-30 18:29:20 +02:00
Jeremy Kersten f4733aa895 [FIX] website - force to test isdigit on a string else a tb "'int' object has no attribute 'isdigit'" can exist if the page var was right and so already and int 2014-06-30 12:27:49 +02:00
Jeremy Kersten 7ba41e75e2 [FIX] Website pager - Be sure that page in get param is a digit else use page 1. 
Need to find which controller add ?page= instead of &page= because google find some url with '?page=1?page=2' --> page = '1?page=2'. According to google, the referrer is the old website.
 2014-06-30 12:10:49 +02:00
Christophe Simonis 8dfd5eab01 [MERGE] forward port of branch saas-4 up to a4bc65c 2014-06-27 16:08:09 +02:00
Christophe Simonis a4bc65cdba [MERGE] forward port of branch saas-3 up to bdc4dd4 2014-06-27 16:06:37 +02:00
Olivier Dony 9c5ecd3bc4 [FIX] website: avoid hiding the signin info for users who are not employees nor portal users 
This happens when you do a plain signup, you
end up as neither an employee nor a portal user,
but should still now when you are logged in.
 2014-06-27 13:04:42 +02:00
Olivier Dony a7aa853737 [FIX] website: exception handling: let redirects pass untouched 
The website module normally tries to render user-friendly
error pages for any error occurring during the processing
of a website-enabled request.
This happens even for werkzeug's HTTPExceptions that have
their own response, because we want the website layout to
be applied on top of the error page.

One special sort of HTTPException should be preserved
without rewriting: the manually-crafted ones generated
with abort(), and usually wrapping a redirect response,
which bears no alteration.
 2014-06-27 13:04:31 +02:00
Christophe Simonis 8cbaf52fd3 Revert "Saas 5 report translation fix sle" 2014-06-26 18:14:44 +02:00
Simon Lejeune 42263b814e Merge remote-tracking branch 'odoo/saas-5' into saas-5-report-translation-fix-sle 2014-06-26 17:05:24 +02:00
Simon Lejeune b8cea9e60f [REV] revert unneeded changes in website layout 2014-06-26 17:04:16 +02:00
Olivier Dony 0d330ca25c [MERGE] Forward-port of saas-4 up to fa739ac 2014-06-25 18:44:51 +02:00
Olivier Dony fa739ac8de [FIX] website: default mimetype for web-published attachments, avoids crash 2014-06-25 18:37:03 +02:00
Olivier Dony 4d488408b2 [MERGE] Forward-port of saas-3 up to 141e1b2 2014-06-25 18:34:03 +02:00
Jeremy Kersten 1a4bfa28c4 [FIX] Sitemap - Back forward from saas-5 5cc1317a5f to have the url_root in sitemap 2014-06-25 13:38:56 +02:00
Christophe Simonis 9e8e3653f2 [MERGE] forward port of branch saas-4 up to f68c835 2014-06-25 12:43:41 +02:00
Fabien Meghazi f988d75035 [FIX] check after openerp's AccessErrors in website's _handle_exception 2014-06-25 12:20:40 +02:00
Fabien Meghazi 4e0799e163 [FIX] _handle_exception() logic amongst requests and ir_http objects 
Changes in website's ir_http#_handle_exception():

- exception is mandatory, can't be None anymore
- we don't touch non website_enabled requests
- we don't touch explicits plain responses from parent
- logic flow is now easier to read (I hope so)

Change in website's ir_http#_dispatch():

- In case of real 404, instead of returning self._handle_exception(),
  just let parent do the job (so we call super())
 2014-06-25 11:47:44 +02:00
Simon Lejeune 478a763cac [MERGE] manual merge of latest bootswatch minified stylesheets 2014-06-24 11:48:49 +02:00
Martin Trigaux caea4a9aec Merge pull request #621 from odoo-dev/saas-4-fix_actions_server_controller_return-vta 
[FIX] website: controller for server actions should accept basic werkzeug requests (e.g. redirections)
 2014-06-23 16:05:04 +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 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
FalcoBolger 97174a2a9d [FIX] Accept http responses as server action response 2014-06-18 13:39:30 +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
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
Olivier Dony f15cbd6520 [MERGE] Forward-port saas-4 bugfixes up to ad4c6ca 2014-06-12 18:54:36 +02:00
Simon Lejeune 10a0edce11 [FIX] request unbound during test execution, add condition in website.layout and livechat 2014-06-11 22:56:55 +02:00
Simon Lejeune 9482bc8f19 [FIX] attempt to render website.layout during test execution 2014-06-11 19:17:56 +02:00
Olivier Dony 6b85d80f23 [FIX] Wrap werkzeug.utils.escape() to accomodate signature change in 0.9 
We always want to escape quotes (") as part of the process of
generating HTML output. This option (quote=True) turned into
an implicit flag with a DeprecationWarning in werkzeug 0.9.0
It is likely to disappear in a future release of werkzeug too.
A wrapper avoids this warning without loss of compatibility
 2014-06-10 18:46:40 +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
Denis Ledoux 9bcda15b97 [FIX] website: prevent to split google analytics script 2014-06-04 16:15:16 +02:00
Christophe Simonis c19bb8ce48 [FIX] website: correct "/" redirect to first menu 2014-06-01 14:30:15 +02:00
Xavier Morel 46712acaec [FIX] bunch of changes lost in incorrect merge f4d78ae738 2014-05-30 17:00:52 +02:00
Xavier Morel d325c0caef [REV] attempt to revert incorrect removals in f4d78ae738 2014-05-30 16:00:28 +02:00
Richard Mathot 8d822419e7 [FIX] website: fix incomplete refactoring 2014-05-30 15:35:59 +02:00
Olivier Dony 04211015fc [MERGE] Forward-port of latest saas-4 fixes, up to 0452851 2014-05-27 20:49:49 +02:00
Christophe Simonis 045285123f [FIX] website: correct bad code indentation introduced during previous commit 2014-05-27 18:46:18 +02:00
Olivier Dony fd21abd847 [MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da 2014-05-27 17:18:43 +02:00
Xavier Morel e06f5b414b [IMP] inherit_option_id -> application 2014-05-27 12:13:51 +02:00