864962a000
[FIX] only render the navbar when everytging is in rendering context
2014-06-29 15:44:56 +02:00
eff2c4fd91
[MERGE] upstream
2014-06-29 13:57:58 +02:00
4bc43e6ac2
[FIX] website snippet editor initialisation
2014-06-29 04:01:24 +02:00
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
20f4da67b3
Merge remote-tracking branch 'odoo/master' into master-report-translation-fix-sle
2014-06-27 18:17:15 +02:00
1f57528bc6
[MERGE] forward port of branch saas-5 up to 8dfd5ea
2014-06-27 16:14:40 +02:00
8dfd5eab01
[MERGE] forward port of branch saas-4 up to a4bc65c
2014-06-27 16:08:09 +02:00
a4bc65cdba
[MERGE] forward port of branch saas-3 up to bdc4dd4
2014-06-27 16:06:37 +02:00
95c1769d55
[FIX] typo
2014-06-27 13:46:46 +02:00
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
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
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
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
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
8cbaf52fd3
Revert "Saas 5 report translation fix sle"
2014-06-26 18:14:44 +02:00
42263b814e
Merge remote-tracking branch 'odoo/saas-5' into saas-5-report-translation-fix-sle
2014-06-26 17:05:24 +02:00
b8cea9e60f
[REV] revert unneeded changes in website layout
2014-06-26 17:04:16 +02:00
893aace122
[MERGE] website_sale optional-products
2014-06-26 12:31:15 +02:00
668b8c2b2d
[FIX] Forward-port of saas-5 up to 0d330ca
2014-06-25 18:58:19 +02:00
0d330ca25c
[MERGE] Forward-port of saas-4 up to fa739ac
2014-06-25 18:44:51 +02:00
fa739ac8de
[FIX] website: default mimetype for web-published attachments, avoids crash
2014-06-25 18:37:03 +02:00
4d488408b2
[MERGE] Forward-port of saas-3 up to 141e1b2
2014-06-25 18:34:03 +02:00
026e38b48f
[REM] Unnecessary `size` parameters on char fields
2014-06-25 17:13:43 +02:00
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
1a4bfa28c4
[FIX] Sitemap - Back forward from saas-5 5cc1317a5f to have the url_root in sitemap
2014-06-25 13:38:56 +02:00
1eaa69d342
[MERGE] forward port of branch saas-5 up to 9e8e365
2014-06-25 12:44:13 +02:00
9e8e3653f2
[MERGE] forward port of branch saas-4 up to f68c835
2014-06-25 12:43:41 +02:00
f988d75035
[FIX] check after openerp's AccessErrors in website's _handle_exception
2014-06-25 12:20:40 +02:00
f0ca6fbf75
merge upstream
2014-06-25 12:02:10 +02:00
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
5112421a93
[FIX] website: correct slug parsing
2014-06-25 11:08:51 +02:00
204a62499a
[IMP] website_sale_options
2014-06-24 15:11:53 +02:00
478a763cac
[MERGE] manual merge of latest bootswatch minified stylesheets
2014-06-24 11:48:49 +02:00
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
2b44ac2cd6
[MERGE] Gengo - Merge saas-4-gengo-jke - Fix gengo to make it working
2014-06-23 12:22:25 +02:00
bad13f0234
merge upstream
2014-06-23 10:07:56 +02:00
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
b4afff3618
Unify website slugify method behavior with or without python-slugify, and add some unit tests
2014-06-20 11:25:44 +02:00
5165b52b43
merge upstream
2014-06-19 18:46:49 +02:00
2d686988a4
[FIX] tour.js: forgotten backdrop and orphan css
2014-06-19 17:52:32 +02:00
eef6330c55
[MERGE] forward port of branch saas-5 up to adf07a9
2014-06-19 16:23:32 +02:00
adf07a9490
[MERGE] forward port of branch saas-4 up to 5087612
2014-06-19 16:13:35 +02:00
5087612d1d
[MERGE] forward port of branch saas-3 up to bf53aed
2014-06-19 15:44:07 +02:00
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
ab1406cd7c
[FIX] website: ignore SVG elements when looking for edition events in RTE
2014-06-19 11:39:14 +02:00
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
6ba14b38cb
[FIX] website: geoip can't be none
2014-06-18 15:43:28 +02:00
890a9ac652
[IMP] website: set geoip in user session
2014-06-18 14:50:24 +02:00
97174a2a9d
[FIX] Accept http responses as server action response
2014-06-18 13:39:30 +02:00
bc3fc54fac
[IMP] Tour: add tour in web module; tour became available in backend.
2014-06-18 12:25:13 +02:00
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
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
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
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
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
c949509b5e
Merge pull request #463 from xmo-odoo/qweb-foreach
...
Qweb foreach
2014-06-17 15:56:09 +02:00
0f72f6517d
Merge pull request #525 from xmo-odoo/master-fix-website-postprocess-xmo
...
Fix postprocessing of request arguments in website
2014-06-17 15:55:55 +02:00
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
cb3d38fa5c
Merge pull request #561 from odoo-dev/master-branding-ref-rim
...
[REF] website: change URL to new Odoo website
2014-06-17 14:31:52 +02:00
c4b1b58ffa
[FIX] sitemap does not show pages
...
the /page/ controller was not using the ``page`` converter
2014-06-17 13:43:57 +02:00
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
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
ab3231d6c9
[REF] website: change URL to new Odoo website
2014-06-16 13:49:39 +02:00
3d66fff4d4
[FIX] website: clean for save of snippet editor don't remove conteneteditable attributes
2014-06-16 11:47:28 +02:00
1587663fd2
[FIX] postprocessing of request arguments in website
...
If website is installed but not used/enabled for the current controller,
overridden methods like _get_converters will *still run* for the controller's
dispatch.
This means a ModelConverter used in a controller with website installed but
not enabled will use website.models.ir_http.ModelConverter, not
base.ir.ir_http.ModelConverter, and base's args postprocessing will *not* be
able to convert the placeholder object to a real UID, only website's
postprocessing can do so.
And as far as I can see there's no reason to skip the URL building validation
either, only the multilang stuff relies on and requires that the controller be
website enabled (and in fact that it be multilang enabled), so only *that*
should be gated behind a flag.
Also always call super(), there's no reason not to and others might add args
to postprocess on base rather than website, ending up after website in the
MRO.
2014-06-13 16:11:56 +02:00
0f01df42ea
[MERGE] Forward-port saas-5 up to f15cbd6
2014-06-12 18:59:15 +02:00
f15cbd6520
[MERGE] Forward-port saas-4 bugfixes up to ad4c6ca
2014-06-12 18:54:36 +02:00
faa09da325
Removed version="7.0" from form views
2014-06-12 09:09:59 +02:00
10a0edce11
[FIX] request unbound during test execution, add condition in website.layout and livechat
2014-06-11 22:56:55 +02:00
9482bc8f19
[FIX] attempt to render website.layout during test execution
2014-06-11 19:17:56 +02:00
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
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
ccdae747a0
[MERGE] forward port of branch saas-5 up to a7c2125
2014-06-10 13:19:55 +02:00
a7c2125735
[MERGE] forward port of branch saas-4 up to 6b8e972
2014-06-10 13:15:46 +02:00
6b8e9727e5
[MERGE] forward port of branch saas-3 up to 4601d85
2014-06-10 12:29:47 +02:00
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
a9a83d00c9
[REM] python-qweb support for as-less foreach
2014-06-05 17:49:08 +02:00
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
9bcda15b97
[FIX] website: prevent to split google analytics script
2014-06-04 16:15:16 +02:00
8dc0503aa5
[FIX] website*: make custom footer independant of main layout
2014-06-02 16:56:36 +02:00
fe3775b96f
[FIX] website: remove standard footer from the DOM instead of hiding it
2014-06-02 12:10:56 +02:00
c19bb8ce48
[FIX] website: correct "/" redirect to first menu
2014-06-01 14:30:15 +02:00
46712acaec
[FIX] bunch of changes lost in incorrect merge f4d78ae738
2014-05-30 17:00:52 +02:00
d325c0caef
[REV] attempt to revert incorrect removals in f4d78ae738
2014-05-30 16:00:28 +02:00
8d822419e7
[FIX] website: fix incomplete refactoring
2014-05-30 15:35:59 +02:00
04211015fc
[MERGE] Forward-port of latest saas-4 fixes, up to 0452851
2014-05-27 20:49:49 +02:00
045285123f
[FIX] website: correct bad code indentation introduced during previous commit
2014-05-27 18:46:18 +02:00
fd21abd847
[MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da
2014-05-27 17:18:43 +02:00
e06f5b414b
[IMP] inherit_option_id -> application
2014-05-27 12:13:51 +02:00
d67161b649
[IMP] renamed some stuff for clarity
2014-05-27 11:57:06 +02:00
80c7b6defc
[IMP] dict(int: True) -> set(int)
2014-05-27 11:57:06 +02:00
da4441246e
[IMP] use set to collect inherit_id and inherit_option_id
...
Also add a few comments to note understanding of code
2014-05-27 11:57:05 +02:00
b5cce44dd2
[IMP] use sets to check for groups/ACL
...
rco notes that group tests are generally intersections, if the user has *any*
group set on the object he can see/use it. This change is a literal
translation of the original semantics, which may be wrong.
2014-05-27 11:57:05 +02:00
4e3864c1fb
[IMP] no need to ensure an actual context if the method does not use it
...
just forwarding the context object does not count as using it, if callees want
a context they can ensure they've got one on their own
2014-05-27 11:57:04 +02:00
85c466611a
[IMP] don't pointlessly recreate view_obj every time _views_get is called, better use of pool & data APIs
2014-05-27 11:57:04 +02:00
ad33728043
[IMP] use sorted + key instead of sort + cmp
2014-05-27 11:57:03 +02:00
3d91b2dfa2
[REM] unused stack_result parameter
2014-05-27 11:57:03 +02:00
e137a7713b
[FIX] website_sale: test did not load js properly and failed
2014-05-26 16:58:14 +02:00
5cc1317a5f
[FIX] sitemap.xml urls
2014-05-26 14:58:30 +02:00
b4c47bcf85
[FIX] website: SEO js
2014-05-26 09:43:01 +02:00
e01725d15a
[FIX] website: SEO promote box
2014-05-26 08:53:54 +02:00
b0e263d00f
[REF] website: shorter tag for charset
2014-05-26 08:51:38 +02:00
2012ee998d
[FIX] website: remove illegal HTML attribute
2014-05-26 08:51:38 +02:00
8fb320e86f
[FIX] website: remove illegal HTML attribute
2014-05-26 08:51:38 +02:00
e28c810123
[FIX] website: convert non-standard HTML metatag to data attribute
2014-05-26 08:51:38 +02:00
df94bddac8
[FIX] website: not well-formed HTML
2014-05-26 08:51:38 +02:00
327dda0bde
[FIX] correctly handle invalid max_width/max_height passed to website._image
2014-05-23 15:11:13 +02:00
4362c6127f
[IMP] use url_encode when building url query string
...
I have no idea why I originall implemented that crap via string munging.
2014-05-23 15:03:23 +02:00
51c7b55da0
[FIX] request.handle_exception: cleanup override logic, fixed chain broken by commit a096ae0
...
handle_exception() is supposed to try handling an exception and if it cannot,
re-raise it. Overridden methods must therefore call super() within a try/except
block, and only attempt to handle the exception if super() raised.
2014-05-23 13:15:52 +02:00
1d70ecd80d
[IMP] website: add max_height and max_width options to image Qweb widget
2014-05-23 11:55:48 +02:00
62c0f6bf11
[FIX] website: ir_http: when rerouting url containing default language -> url without language, the ? was missing, leading to wrong urls.
2014-05-23 10:39:26 +02:00
319f4cb270
[FIX] website: define languages variable outside of an 'if' as it is used below in the same template, leading to a crash due to the variable not always being defined.
2014-05-23 10:23:13 +02:00
c0e9a15960
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. a096ae0080
2014-05-22 09:35:26 +02:00
a096ae0080
[FIX] http: force rolleback for failed http request
...
1st issue:
When an exception was raised, it was badly handled by the website in case of
website_enabled key. The response page was generated without calling super.
The WebRequest object being responsible to rollback the transaction in case
of errors.
2sd issue:
The _failed attribute is required to rollback the transaction in an WebRequest
object. Previously it was only set in the JsonRequest object (which inherit
from WebRequest), replace by call to super. The attribute _failed is now set
in the WebRequest object.
2014-05-21 19:12:37 +02:00
593cdf427f
Merge remote-tracking branch 'odoo/master' into master-seperate-bundle-fme
2014-05-21 10:29:04 +02:00
93238cd1cb
[FIX] website: respect max_{width,height} for /website/image route
2014-05-20 20:23:25 +02:00
a756b82372
[MERGE] forward port of branch saas-4 up to revid bb26dea
2014-05-20 20:19:55 +02:00
040c93026a
[MERGE] merge bzr trunk addons branch
2014-05-20 18:10:36 +02:00
863edbaaf2
Seperate assets_common from other bundles
2014-05-20 17:06:25 +02:00
59bfda8efd
Slug redirects loses query_string
2014-05-20 10:25:39 +02:00
42d8a90afd
[IMP] minor changes to sitemap
2014-05-19 13:59:38 +02:00
2df2da6514
[FIX] properly set website_multilang attribute
2014-05-19 12:33:47 +02:00
f90a37ea70
[IMP] sitemap caches it's output in ir.attachment
2014-05-16 15:31:26 +02:00
e27c1b91f9
[MERGE] upstream
2014-05-16 15:31:11 +02:00
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
3d881b1a0c
[REM] debuggin stuff
2014-05-15 17:26:37 +02:00
828b7aef2f
[WIP] sitemap
2014-05-15 16:58:16 +02:00
cada6437d5
[REM] temporary disable sitemap
2014-05-15 10:25:18 +02:00
2e0e242c82
[REV] Revert lazy sitemap
2014-05-14 17:11:16 +02:00
6130ed3ce0
[IMP] website: refactor website_image controller (and placeholder), move to model to make it reusable
...
It is "almost" reusable because it still depends on the global `request` variable,
this could be solved by making it an explicit parameter.
2014-05-14 16:32:36 +02:00
a20ccfc7d4
[FIX] lazy sitemap with generators
2014-05-14 15:48:51 +02:00
f4d78ae738
Merge branch 'server-trunk'
...
Conflicts:
addons/mass_mailing/controllers/main.py
2014-05-14 15:13:04 +02:00
e6e5ac048b
[FIX] broken routes for pages
2014-05-14 12:11:24 +02:00
c3cfc4bc32
[MERGE] sitemap backport, merge trunk from 9438 til 9440
...
merge from 9438 revid:fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4 til 9440 revid:fp@tinyerp.com-20140511143314-nzn1239l00arbxjq
2014-05-13 16:38:31 +02:00
119823ab84
[IMP] Redirect to language-less url on default language
2014-05-13 12:07:29 +02:00
c73a2f1c57
[FIX] restore request.website_multilang for templates
2014-05-13 12:07:20 +02:00
8eed143112
[IMP] Invert multilang logic in route decorator. True by default, can be set to False explicitlty
2014-05-13 11:35:45 +02:00
4118f9ed0a
[IMP] openerpframework moved in common asset bundle
2014-05-13 10:18:31 +02:00
023aa7acdf
[FIX] website_forum links which should not be, post-install crawler
...
* move URLs of purely-JS-hook <a> to data-href so the crawler does not try to
access them (they're JSON-RPC endpoints...)
* replace side-effecting links (...) by styled buttons
* fix crawler to not take fragments in account when deduplicating and
navigating URLs
2014-05-12 18:34:55 +02:00
1d08697bc1
[FIX] Do not display language choice if multilang=False
2014-05-12 17:42:01 +02:00
4a29752451
[IMP] openerpframework moved in common asset bundle
2014-05-12 17:19:34 +02:00
05c598f0b3
[ADD] website.menu editable list in website config
...
bzr revid: fme@openerp.com-20140512113820-oidhod8ovqp3nh9a
2014-05-12 13:38:20 +02:00
555d4879c8
Forward-port of latest saas-4, up to revision 9416 (rev-id fme@openerp.com-20140509164338-gnz7p3qxt8etrh5w)
...
bzr revid: mat@openerp.com-20140512072331-0lidgqb6x7fregdj
2014-05-12 09:23:31 +02:00
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
cebce64b00
[FIX] better handling of '/'. / is the first menu and not the first menu is /. Allows to move the first menu in another position
...
bzr revid: fp@tinyerp.com-20140511153235-6mmygt69z45rcx4r
2014-05-11 17:32:35 +02:00
105618443f
[IMP] Sitemap
...
bzr revid: fp@tinyerp.com-20140511134037-84vnn1b4zfzk8som
2014-05-11 15:40:37 +02:00
54d30d5194
[IMP] clean sitemap, enumerate pages + fixes
...
bzr revid: fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4
2014-05-11 13:52:31 +02:00
501ad7abeb
[IMP] dumb code
...
bzr revid: fme@openerp.com-20140509151855-7v4hp08qvmac1u2d
2014-05-09 17:18:55 +02:00
7caabb8f75
[MERGE] upsteam
...
bzr revid: fme@openerp.com-20140509144608-btah4s8zorzon2jo
2014-05-09 16:46:08 +02:00
69a93b07c7
[MOV] ir.ui.view#write() forced noupdate moved in `website` (RTE only)
...
bzr revid: fme@openerp.com-20140509141024-xa9mawoye3o8e6c1
2014-05-09 16:10:24 +02:00
4c24985289
[ADD] alternate hreflang links in head for search engines
...
cf: https://support.google.com/webmasters/answer/189077?hl=en
bzr revid: fme@openerp.com-20140509122400-49sl631mwipx1039
2014-05-09 14:24:00 +02:00
f652660cb6
[FIX] is_multilang_url by checking against werkzeug's routing map using query string too
...
bzr revid: fme@openerp.com-20140509122323-2ext0livjgr5njb0
2014-05-09 14:23:23 +02:00
95e1bd0612
[REM] completetly removed website#preprocess_request()
...
bzr revid: fme@openerp.com-20140507170816-rrnh1nlqf97pfy3k
2014-05-07 19:08:16 +02:00
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
1091b24a0c
[MERGE] forward port of branch saas-3 up to revid 9450 chs@openerp.com-20140507153348-g2qw61dkxvps13br
...
bzr revid: chs@openerp.com-20140507160023-8wwqlbf3bv7yqe67
2014-05-07 18:00:23 +02:00
56eeefdfda
[MERGE] trunk-websit-al-refactor by chm
...
- allow fiscal position change on sale orders
- public user on website
- simplify website_sale sale.order and shopping cart code
- remove preprocess_request
bzr revid: al@openerp.com-20140507153223-q73u5lhyrfw98o3a
2014-05-07 17:32:23 +02:00
ee1fbd17c8
[FIX] jQuery.ui - boostrap conflict
...
bzr revid: fme@openerp.com-20140506153335-x2fwpajvthcru1cv
2014-05-06 17:33:35 +02:00
cf8cf4f255
[REM] preprocess_request from website
...
The method is still there with only a pass statement
Will completetly remove once chm merges his branch
bzr revid: fme@openerp.com-20140505163841-lstk3r37sf23ngrg
2014-05-05 18:38:41 +02:00
3f032f3f97
[FIX] website editor: background image
...
bzr revid: chm@openerp.com-20140505150722-gwewelvu3uv6joen
2014-05-05 17:07:22 +02:00
74a6bde093
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140505134608-hqcmqyo3d98y851j
2014-05-05 15:46:08 +02:00
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
939b2f2d44
[FIX] website_sale & tour
...
bzr revid: chm@openerp.com-20140502155124-98xz2b4gd2zzzrkx
2014-05-02 17:51:24 +02:00
deb091ea64
[FIX] website: missing acl for manage website menu
...
bzr revid: dle@openerp.com-20140502134135-zp05ecbpcj8inftc
2014-05-02 15:41:35 +02:00
ee16b014b1
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140502095132-kfx40xou73mukr2y
2014-05-02 11:51:32 +02:00
2998bec0e0
[FIX] website controller, correctly resolve last merge about images
...
fix fp commit to use debian compatible werkzeug api data instead of set_data
bzr revid: al@openerp.com-20140501165004-0e6xp8e9hdpifofj
2014-05-01 18:50:04 +02:00
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
7e25b9ae55
[MERGE] saas-4 report_webkit missing dependency on report
...
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
1dd63bce78
[IMP] website images: allow no max_width (default), faster loading if no resize
...
bzr revid: fp@tinyerp.com-20140501114003-5xs31o0lzpp8ru2s
2014-05-01 13:40:03 +02:00
46b422def0
[REM] useless id's in script and links
...
bzr revid: fme@openerp.com-20140430073104-qwb0opveyx5hnplg
2014-04-30 09:31:04 +02:00
a1d3b7d9ad
[REM] duplicates in assets
...
bzr revid: fme@openerp.com-20140430072102-2nzi1lcm95exb6v4
2014-04-30 09:21:02 +02:00
45aba13ed5
[FIX] bootstrap-tour removed
...
bzr revid: fme@openerp.com-20140429161604-dq0ny7bjioe6bjg3
2014-04-29 18:16:04 +02:00
b7003a382a
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +02:00
c92e1b6bcb
[IMP] Rename assets_frontend
...
bzr revid: fme@openerp.com-20140429145745-t3u41tzv6qnndlla
2014-04-29 16:57:45 +02:00
23f36f03ce
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev 9440 odo@openerp.com-20140429123517-wtjcw6xl8qgtnkeg
...
bzr revid: odo@openerp.com-20140429125514-sv92pxfmhjmhplnu
2014-04-29 14:55:14 +02:00
81c251836d
[FIX] website: grant edit rights to website manager
...
bzr revid: odo@openerp.com-20140429123517-wtjcw6xl8qgtnkeg
2014-04-29 14:35:17 +02:00
048c4c284b
[FIX] Url mismatch redirection should only be done for GET and HEAD http verbs
...
bzr revid: fme@openerp.com-20140429095643-hmq1t45tgv3opyh8
2014-04-29 11:56:43 +02:00
fdaa70f319
[REM] language passed as query param for bundles controllers
...
'translatable' has been removed from assets templates, no need for this anymore
bzr revid: fme@openerp.com-20140428124513-vlbm1hjsv9989den
2014-04-28 14:45:13 +02:00
6d60aadfb8
[FIX] ace editor can't find it's assets if code is bundled
...
It's tries to find it's own <script> tag but fail to do so.
bzr revid: fme@openerp.com-20140425130229-koavz642l01txlxn
2014-04-25 15:02:29 +02:00
eae846f2c8
[FIX] remove @translatable conditions and de-activate group_website_designer specifics
...
Bundlification (and later merge of editor and web client) can't work with conditional
script inclusion
bzr revid: fme@openerp.com-20140425124913-9jsfhbfhoq6j6xxl
2014-04-25 14:49:13 +02:00
4f16d15120
[IMP] rename editor assets
...
bzr revid: fme@openerp.com-20140425101753-gz6c8q9huw9c04yp
2014-04-25 12:17:53 +02:00
0efb6fc28b
[FIX] Inverse logic for /page/website.<id> shortcut
...
bzr revid: fme@openerp.com-20140425083521-8rd1u3y4da8sf89i
2014-04-25 10:35:21 +02:00
13469c23d8
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140424135841-akc01inl26fcirwy
2014-04-24 15:58:41 +02:00
7a7d7febf8
[MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
...
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
3ad6d69b21
[FIX] website: avoid using werkzeug API only present in 0.9+
...
bzr revid: odo@openerp.com-20140424131415-ot0r5062wndvuicr
2014-04-24 15:14:15 +02:00
90d0139ae1
[FIX] website tour: must retry running tour because in test mode some files are added after the first running try
...
bzr revid: chm@openerp.com-20140424124703-qeft3n8xjmb1mvxn
2014-04-24 14:47:03 +02:00
ee7ff4bd07
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140423154852-gzegxqrzb2sj01zl
2014-04-23 17:48:52 +02:00
1d8400418e
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140423123744-zfz7k8drn2t624zu
2014-04-23 14:37:44 +02:00
ff9ae691d5
[FIX] website: snippet editor: speed up save view (construct only option with clean_for_save method); fix carousel arrow
...
bzr revid: chm@openerp.com-20140423095901-q945d4593uet41xy
2014-04-23 11:59:01 +02:00
618fbde36f
[MERGE] forward port of branch saas-4 up to revid 9365 chs@openerp.com-20140422143249-3cfh18tenn3a5ry1
...
bzr revid: chs@openerp.com-20140422144651-840zze7p5549k88s
bzr revid: chs@openerp.com-20140422144933-0su8g7pgrcloijco
2014-04-22 16:49:33 +02:00
7a04b9ca90
[REM] Remove useless auth='public' for js and css bundle controllers (now defined in web client)
...
bzr revid: fme@openerp.com-20140422143428-iggemicd37wzcd2d
2014-04-22 16:34:28 +02:00
12beacda08
[MERGE] backport of trunk revisions:
...
9362 fp@tinyerp.com-20140421205739-rki3bctinjy3amzy [MERGE] new module: website_forum_doc + small fixes (close) in forum
9363 fp@tinyerp.com-20140421213850-19gk3hfz8qxa6fw3 [IMP] improved form view for posts
bzr revid: chs@openerp.com-20140422143249-3cfh18tenn3a5ry1
2014-04-22 16:32:49 +02:00
0ec498371e
[FIX] translatable condition on *.editor.js assets
...
bzr revid: fme@openerp.com-20140422141656-r9cx0z7mkwhe51hp
2014-04-22 16:16:56 +02:00
7f29d7e371
[FIX] website: pass `lang` to js and css bundle controllers
...
bzr revid: fme@openerp.com-20140422135022-u9p7zofv5sbeqo30
2014-04-22 15:50:22 +02:00
c117c3e10f
[MOV] website: translatable context var from website#preprocess_request to ir.ui.view#render
...
bzr revid: fme@openerp.com-20140422134748-9niep8iyzx9ldq1l
2014-04-22 15:47:48 +02:00
cbf071a62c
[IMP] better layout for documentation
...
bzr revid: fp@tinyerp.com-20140421144510-9qo1whru5u5ec721
2014-04-21 16:45:10 +02:00
02a9df59b7
[FIX] website: media editor: display popup when user click on save button of the view
...
bzr revid: chm@openerp.com-20140418150831-k7fnd7y6ywrmxv6j
2014-04-18 17:08:31 +02:00
74d4d1f58d
[CHG] bundlify website
...
CKEDITOR_BASEPATH has to be defined, by default ckeditor will load its files
relative to "itself" (the file which executes it). After bundling, the path is
incorrect and ckeditor looks for its files (e.g. en.js) in the wrong place.
bzr revid: xmo@openerp.com-20140418121503-4nsja7enutney2vn
2014-04-18 14:15:03 +02:00
3452694885
[MERGE] [IMP] website: tour: nice smooth cool and sexy effect when closing
...
or ending the tour.
bzr revid: tde@openerp.com-20140417162820-bdcpdenddqxzj949
2014-04-17 18:28:20 +02:00
2fdc1d1905
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140416111721-g2vw6140a3adhk6y
2014-04-16 13:17:21 +02:00
d264cd1640
[IMP] website_mail: make the template / mail editor work. We now have a limited
...
set of fields that we try to edit (body_html and body for body, email_from and email for
email-from, name and subject for subject), because t-field is not dynamic. If the model
that should be edited does not hold those fields, the mail editor won't work.
Also fixed editor not being actiated when going into the body edition.
bzr revid: tde@openerp.com-20140416105901-vavkh9erjsq4mof9
2014-04-16 12:59:01 +02:00
ca8b6cc703
[MERGE] Allow to use many2one for qweb template (work also with view_id)
...
bzr revid: jke@openerp.com-20140416085136-xxqsqjyie5vtf6f3
2014-04-16 10:51:36 +02:00
c4164204b5
[FIX] Website - fix path of script watch.js
...
bzr revid: jke@openerp.com-20140416083411-a06k9sbiyda7zmrd
2014-04-16 10:34:11 +02:00
dbe1b81d15
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140416074634-jkcn3ae30q9uqnsi
2014-04-16 09:46:34 +02:00
9c0526b1bd
[FIX] website tour: test mode + add log
...
bzr revid: chm@openerp.com-20140415153734-5n2sz3xn01ydfeh6
2014-04-15 17:37:34 +02:00
61da3f4aba
[MERGE] forward port of branch saas-3 up to revid 9409 dle@openerp.com-20140415101427-a6r7lgy50x9bdah3
...
bzr revid: chs@openerp.com-20140415142934-rlka4vkxd34fkil8
2014-04-15 16:29:34 +02:00
1e93741081
[FIX] Website banner tour - Fix test according to new banner structure
...
bzr revid: jke@openerp.com-20140415101406-54cdr44xayvyq8xo
2014-04-15 12:14:06 +02:00
df55b1eb9d
[FIX] Website tour - Click inside the zone before to insert sampleText
...
bzr revid: jke@openerp.com-20140415100834-2pstpw357y9klc89
2014-04-15 12:08:34 +02:00
9c739f12c2
[FIX] Remove watcher, need to be review because it breaks other tests.
...
bzr revid: jke@openerp.com-20140414165721-i8g23jxy66p1p6ao
2014-04-14 18:57:21 +02:00
faa899adde
[FIX] Reactive watcher
...
bzr revid: jke@openerp.com-20140414163412-88seef6j58xiamug
2014-04-14 18:34:12 +02:00
552a23a4bd
[FIX] Remove watcher
...
bzr revid: jke@openerp.com-20140414153537-0qjlnqqnk0q9utn0
2014-04-14 17:35:37 +02:00
a8ce5415ad
[FIX] Watch if jQuery is overwritted by another version in some script. If an override is detected, we check that all old function is always present else we add the missing.
...
The problem was that some websites uses externals libraries which use a jQuery more recent that our version. Jquery by default checks his own version and overwrite itself if the current version is lower.
Once user had their jquery overwritted, function dropdown was missing and it was impossible to the end user to get menu working again... and so impossible to remove the view with the front end.
bzr revid: jke@openerp.com-20140414151423-zhi3tjj52rihltzy
2014-04-14 17:14:23 +02:00
66e72fec54
[FIX] Website - Don't set active on OpenDialog link else the user cannot click on it again after.
...
bzr revid: jke@openerp.com-20140414094803-bfyvu3wizy09n53c
2014-04-14 11:48:03 +02:00
1b6585e614
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140414081610-h4qzg0okrwrxggar
2014-04-14 10:16:10 +02:00
3f7e567acc
[FIX] website
...
bzr revid: chm@openerp.com-20140414081451-0hzjgaewtcok6rod
2014-04-14 10:14:51 +02:00
23abadb62b
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140411124318-pgxdmjfidsyny2ob
2014-04-11 14:43:18 +02:00
a2f62bc341
[FIX] website tour: error log
...
bzr revid: chm@openerp.com-20140411123305-t2n1aej9akn0zb5r
2014-04-11 14:33:05 +02:00
63c2093d2c
[IMP] Larger texts
...
bzr revid: fp@tinyerp.com-20140411122232-s8yipnar4tllspm0
2014-04-11 14:22:32 +02:00
8ce4ac4d94
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140411115525-87b9wa1ttwphiwf2
2014-04-11 13:55:25 +02:00
ab5aa5daff
[FIX] website tour: write undefined in log
...
bzr revid: chm@openerp.com-20140411115502-804e5669do02swm2
2014-04-11 13:55:02 +02:00
aa6386467a
[FIX] website: snippet clean_for_save: filter snippet before create overlay
...
bzr revid: chm@openerp.com-20140411115314-xr5yutao88j8fusu
2014-04-11 13:53:14 +02:00
584f2bea07
[IMP] website: Tour: add a log time
...
bzr revid: chm@openerp.com-20140411105105-y7vxgkf7nydjb1f8
2014-04-11 12:51:05 +02:00
a7dae4e741
[MERGE]with latest trunk.
...
bzr revid: kch@tinyerp.com-20140411093642-6o1luwd111qwtirn
2014-04-11 15:06:42 +05:30
1fc8f89bc1
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140411082050-lr7vtew6yvsqaon6
2014-04-11 10:20:50 +02:00
aaa3265f47
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140411081401-0ybuuboo6f3b58kv
2014-04-11 10:14:01 +02:00
67b413dba5
[IMP]improved code for increasing speed pf closing help as per usability review.
...
bzr revid: kch@tinyerp.com-20140411060833-mjf3j2549ya2pre9
2014-04-11 11:38:33 +05:30
7c75b5e004
[FIX] website: avoid discarding snippet animator after edit + properly restart animation while disabling clicks
...
bzr revid: odo@openerp.com-20140410174314-vecg7inmfgm7r5fq
2014-04-10 19:43:14 +02:00
7298130f31
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140410152925-ndajhnyh4rt8pkgu
2014-04-10 17:29:25 +02:00
8ff2bb683f
[MERGE][FIX] Mobile preview of blogs
...
bzr revid: rim@openerp.com-20140414144407-cz3fmydj8vpzl7n6
2014-04-14 16:44:07 +02:00
bafa8e448d
[FIX] Website_mail - Add selectors to allow drag and drop of snippet in email template
...
bzr revid: jke@openerp.com-20140414143001-26p3ka7dwb1er6y0
2014-04-14 16:30:01 +02:00
afc2685cee
[FIX] wesbite: banner - remove css and use bootstrap for positionning. Now hidden-xs works, we don't lost 50% of width
...
bzr revid: jke@openerp.com-20140414142631-k78shkqjqdtcnp83
2014-04-14 16:26:31 +02:00
8da0820a88
[FIX] website: media editor: when the user save the picture, the dialog box re-open automatically. Do not re-active snippet when we save a field image
...
bzr revid: chm@openerp.com-20140414082617-svxpb6kuqfhjm8oa
2014-04-14 10:26:17 +02:00
ac8ada1a47
[MERGE] Sync with parent
...
bzr revid: rim@openerp.com-20140410120341-n1idn9rtnf2lmvcy
2014-04-10 14:03:41 +02:00
3a7e003656
[MERGE] forward port of branch saas-3 up to revid 9394 chs@openerp.com-20140410103638-x7vajn70ewsfp0ck
...
bzr revid: chs@openerp.com-20140410110424-enhdg6pufhii56ni
2014-04-10 13:04:24 +02:00
9f6def6408
[TEST]for test on runbot.
...
bzr revid: vme@tinyerp.com-20140410105643-ndznhar8a6x6uevg
2014-04-10 16:26:43 +05:30
0be5ebf9d6
[MERGE]with latest trunk.
...
bzr revid: kch@tinyerp.com-20140410094107-27ey4hms034mob6k
2014-04-10 15:11:07 +05:30
ae8f388ded
[FIX]forgot to change variable name.
...
bzr revid: kch@tinyerp.com-20140410092901-3422iz7nam26xr9c
2014-04-10 14:59:01 +05:30
e29174090a
[MERGE] Sync with trunk
...
bzr revid: richard_mathot_openerp-20140409194248-ii36xsv0lpr68rmt
2014-04-09 21:42:48 +02:00
15c035631d
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140409154520-eddr2h21bei95xxu
2014-04-09 17:45:20 +02:00
48e5bb9075
[MERGE] test_cursor: adapt code to small api changes in registry for handling http tests
...
bzr revid: rco@openerp.com-20140409150002-le29vuu4x41j61q6
2014-04-09 17:00:02 +02:00
f090689984
[FIX] website: The separator block is not working (no drop zone)
...
bzr revid: chm@openerp.com-20140409140733-ne0frg4o7b3c1lr0
2014-04-09 16:07:33 +02:00
4347df6e4d
[FIX] website: Default Url not correct for the button 'contact us' in the block features>Button
...
bzr revid: chm@openerp.com-20140409134143-aoiqbd2aqe78hgyc
2014-04-09 15:41:43 +02:00
fc48e1a8d2
[TYPO] website: tour for banner
...
bzr revid: chm@openerp.com-20140409133330-6ny4oug0hucpzsn8
2014-04-09 15:33:30 +02:00
88eaa5f26f
[IMP] website: remove transform in modile view and change order menu
...
bzr revid: chm@openerp.com-20140409124321-cwu86whebzuwtz1e
2014-04-09 14:43:21 +02:00
4dc3b139f3
[IMP] ir_qweb, ir_ui_view: can use id insead of xml_id; can render ir.ui.view many2one with widget='qweb' in template
...
bzr revid: chm@openerp.com-20140409104427-ut3r5acavyjsp6bj
2014-04-09 12:44:27 +02:00
560166d5a1
[FIX] website/tests: fix test_requests by manually switching registry to test mode
...
bzr revid: rco@openerp.com-20140409092450-2r4gx0eggw2p7lch
2014-04-09 11:24:50 +02:00
d763530ac9
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140409075034-zale7ojgj2fh347l
2014-04-09 09:50:34 +02:00
3993d1ce2f
[FIX] website: snippet parallax. Error when the user activate a snippet parallax already inserted
...
bzr revid: chm@openerp.com-20140409072813-43fqwcr7j6i0zl0e
2014-04-09 09:28:13 +02:00
5c5a3c4887
[FIX] website: snippet parallax
...
bzr revid: chm@openerp.com-20140408154926-dq4k4bvmfaq2r6rl
2014-04-08 17:49:26 +02:00
d2407ec8c4
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140408154556-e4ud0kzyfcm13iui
2014-04-08 17:45:56 +02:00
8a3e35e3bb
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140408154510-8snznjqkrdl3jwdg
2014-04-08 17:45:10 +02:00
Simon Lejeune
Antony Lesuisse
Christophe Simonis
Olivier Dony
Christophe Simonis
Jaydeep Barot
Christophe Matthieu
Jeremy Kersten
Fabien Meghazi
Martin Trigaux
Franck Bret
Paramjit Singh Sahota
Xavier Morel
FalcoBolger
Thibault Delavallée
xmo-odoo
Denis Ledoux
Richard Mathot
Denis Ledoux
Martin Trigaux
Christophe Simonis
rim-odoo
Fabien Pinckaers
Christophe Simonis
Kunal Chavda
Kersten Jeremy
Vidhin Mehta (OpenERP)
Raphael Collet