Simon Lejeune
2870af3b49
[FIX] navbar cache: do not use ormcache as it does not handle kwargs. instead, only get the root menu_ids in rendering context
2014-06-30 19:45:12 +02:00
Simon Lejeune
af4cd36c83
[MERGE] upstream
2014-06-30 17:48:08 +02:00
Antony Lesuisse
e634ec806f
[IMP] website crawler log show query/s
2014-06-29 21:39:30 +02:00
Antony Lesuisse
78e044b5c7
[IMP] test impprove HTTPCase opener
...
Simplify website crawler using the generic HTTPCase opener
2014-06-29 20:04:30 +02:00
Simon Lejeune
864962a000
[FIX] only render the navbar when everytging is in rendering context
2014-06-29 15:44:56 +02:00
Simon Lejeune
eff2c4fd91
[MERGE] upstream
2014-06-29 13:57:58 +02:00
Antony Lesuisse
4bc43e6ac2
[FIX] website snippet editor initialisation
2014-06-29 04:01:24 +02:00
Simon Lejeune
76039b2a37
[FIX] only render the navbar when website is set (ie not during tests of the reports)
2014-06-27 18:28:34 +02:00
Simon Lejeune
20f4da67b3
Merge remote-tracking branch 'odoo/master' into master-report-translation-fix-sle
2014-06-27 18:17:15 +02:00
Christophe Simonis
1f57528bc6
[MERGE] forward port of branch saas-5 up to 8dfd5ea
2014-06-27 16:14:40 +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
Simon Lejeune
95c1769d55
[FIX] typo
2014-06-27 13:46:46 +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
3db44722d4
[FIX] website: correct geoip resolver
...
- "`record_by_addr()` method require the city database.
- The loaded geoip database can be specified via config file
2014-06-27 12:46:56 +02:00
Simon Lejeune
fc8592adf2
[FIX] Report: translation fixed, use of 'primary clone' of web.layout and website.layout, minimal template is now a QWeb template
2014-06-27 12:00:49 +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
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
Antony Lesuisse
893aace122
[MERGE] website_sale optional-products
2014-06-26 12:31:15 +02:00
Olivier Dony
668b8c2b2d
[FIX] Forward-port of saas-5 up to 0d330ca
2014-06-25 18:58:19 +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
Jaydeep Barot
026e38b48f
[REM] Unnecessary `size` parameters on char fields
2014-06-25 17:13:43 +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
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
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
Fabien Meghazi
f988d75035
[FIX] check after openerp's AccessErrors in website's _handle_exception
2014-06-25 12:20:40 +02:00
Christophe Matthieu
f0ca6fbf75
merge upstream
2014-06-25 12:02:10 +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
Christophe Simonis
5112421a93
[FIX] website: correct slug parsing
2014-06-25 11:08:51 +02:00
Christophe Matthieu
204a62499a
[IMP] website_sale_options
2014-06-24 15:11:53 +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
Christophe Matthieu
bad13f0234
merge upstream
2014-06-23 10:07:56 +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
Franck Bret
b4afff3618
Unify website slugify method behavior with or without python-slugify, and add some unit tests
2014-06-20 11:25:44 +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
Xavier Morel
56009e8804
[FIX] website: missing timezone conversion back to UTC
...
In t-field, datetime fields (formatted and not formatted versions) are
converted to the context/user's timezone (through
fields.datetime.context_timestamp) when displayed, but were saved without
converting back so the next display would go forward (or back) of the user's
tzoffset.
Fix that by applying context_timestamp's conversion backwards, from the
context/user's timezone back to UTC, before saving the field's value.
2014-06-18 16:09:02 +02:00