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
Christophe Matthieu
6ba14b38cb
[FIX] website: geoip can't be none
2014-06-18 15:43:28 +02:00
Christophe Matthieu
890a9ac652
[IMP] website: set geoip in user session
2014-06-18 14:50:24 +02:00
FalcoBolger
97174a2a9d
[FIX] Accept http responses as server action response
2014-06-18 13:39:30 +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
xmo-odoo
c949509b5e
Merge pull request #463 from xmo-odoo/qweb-foreach
...
Qweb foreach
2014-06-17 15:56:09 +02:00
xmo-odoo
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
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
Richard Mathot
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
Fabien Meghazi
c4b1b58ffa
[FIX] sitemap does not show pages
...
the /page/ controller was not using the ``page`` converter
2014-06-17 13:43:57 +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
Richard Mathot
ab3231d6c9
[REF] website: change URL to new Odoo website
2014-06-16 13:49:39 +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
Xavier Morel
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
Olivier Dony
0f01df42ea
[MERGE] Forward-port saas-5 up to f15cbd6
2014-06-12 18:59:15 +02:00
Olivier Dony
f15cbd6520
[MERGE] Forward-port saas-4 bugfixes up to ad4c6ca
2014-06-12 18:54:36 +02:00
Fabien Meghazi
faa09da325
Removed version="7.0" from form views
2014-06-12 09:09:59 +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
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
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
ccdae747a0
[MERGE] forward port of branch saas-5 up to a7c2125
2014-06-10 13:19:55 +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
a9a83d00c9
[REM] python-qweb support for as-less foreach
2014-06-05 17:49:08 +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
Denis Ledoux
9bcda15b97
[FIX] website: prevent to split google analytics script
2014-06-04 16:15:16 +02:00
Richard Mathot
8dc0503aa5
[FIX] website*: make custom footer independant of main layout
2014-06-02 16:56:36 +02:00
Richard Mathot
fe3775b96f
[FIX] website: remove standard footer from the DOM instead of hiding it
2014-06-02 12:10:56 +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
Xavier Morel
d67161b649
[IMP] renamed some stuff for clarity
2014-05-27 11:57:06 +02:00
Xavier Morel
80c7b6defc
[IMP] dict(int: True) -> set(int)
2014-05-27 11:57:06 +02:00
Xavier Morel
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
Xavier Morel
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
Xavier Morel
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
Xavier Morel
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
Xavier Morel
ad33728043
[IMP] use sorted + key instead of sort + cmp
2014-05-27 11:57:03 +02:00
Xavier Morel
3d91b2dfa2
[REM] unused stack_result parameter
2014-05-27 11:57:03 +02:00
Richard Mathot
e137a7713b
[FIX] website_sale: test did not load js properly and failed
2014-05-26 16:58:14 +02:00
Fabien Meghazi
5cc1317a5f
[FIX] sitemap.xml urls
2014-05-26 14:58:30 +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
b0e263d00f
[REF] website: shorter tag for charset
2014-05-26 08:51:38 +02:00
Richard Mathot
2012ee998d
[FIX] website: remove illegal HTML attribute
2014-05-26 08:51:38 +02:00
Richard Mathot
8fb320e86f
[FIX] website: remove illegal HTML attribute
2014-05-26 08:51:38 +02:00
Richard Mathot
e28c810123
[FIX] website: convert non-standard HTML metatag to data attribute
2014-05-26 08:51:38 +02:00
Richard Mathot
df94bddac8
[FIX] website: not well-formed HTML
2014-05-26 08:51:38 +02:00
Xavier Morel
327dda0bde
[FIX] correctly handle invalid max_width/max_height passed to website._image
2014-05-23 15:11:13 +02:00
Xavier Morel
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
Denis Ledoux
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
Richard Mathot
1d70ecd80d
[IMP] website: add max_height and max_width options to image Qweb widget
2014-05-23 11:55:48 +02:00
--global
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
--global
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
Denis Ledoux
c0e9a15960
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. a096ae0080
2014-05-22 09:35:26 +02:00
Martin Trigaux
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
Fabien Meghazi
593cdf427f
Merge remote-tracking branch 'odoo/master' into master-seperate-bundle-fme
2014-05-21 10:29:04 +02:00
Christophe Simonis
93238cd1cb
[FIX] website: respect max_{width,height} for /website/image route
2014-05-20 20:23:25 +02:00
Christophe Simonis
a756b82372
[MERGE] forward port of branch saas-4 up to revid bb26dea
2014-05-20 20:19:55 +02:00
Christophe Simonis
040c93026a
[MERGE] merge bzr trunk addons branch
2014-05-20 18:10:36 +02:00
Fabien Meghazi
863edbaaf2
Seperate assets_common from other bundles
2014-05-20 17:06:25 +02:00
Fabien Meghazi
59bfda8efd
Slug redirects loses query_string
2014-05-20 10:25:39 +02:00
Fabien Meghazi
42d8a90afd
[IMP] minor changes to sitemap
2014-05-19 13:59:38 +02:00
Fabien Meghazi
2df2da6514
[FIX] properly set website_multilang attribute
2014-05-19 12:33:47 +02:00
Fabien Meghazi
f90a37ea70
[IMP] sitemap caches it's output in ir.attachment
2014-05-16 15:31:26 +02:00
Fabien Meghazi
e27c1b91f9
[MERGE] upstream
2014-05-16 15:31:11 +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 Meghazi
3d881b1a0c
[REM] debuggin stuff
2014-05-15 17:26:37 +02:00
Fabien Meghazi
828b7aef2f
[WIP] sitemap
2014-05-15 16:58:16 +02:00
Fabien Meghazi
cada6437d5
[REM] temporary disable sitemap
2014-05-15 10:25:18 +02:00
Fabien Meghazi
2e0e242c82
[REV] Revert lazy sitemap
2014-05-14 17:11:16 +02:00
Olivier Dony
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
Fabien Meghazi
a20ccfc7d4
[FIX] lazy sitemap with generators
2014-05-14 15:48:51 +02:00
Xavier Morel
f4d78ae738
Merge branch 'server-trunk'
...
Conflicts:
addons/mass_mailing/controllers/main.py
2014-05-14 15:13:04 +02:00
Fabien Meghazi
e6e5ac048b
[FIX] broken routes for pages
2014-05-14 12:11:24 +02:00
Fabien Meghazi
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
Fabien Meghazi
119823ab84
[IMP] Redirect to language-less url on default language
2014-05-13 12:07:29 +02:00
Fabien Meghazi
c73a2f1c57
[FIX] restore request.website_multilang for templates
2014-05-13 12:07:20 +02:00
Fabien Meghazi
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
Fabien Meghazi
4118f9ed0a
[IMP] openerpframework moved in common asset bundle
2014-05-13 10:18:31 +02:00
Xavier Morel
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
Fabien Meghazi
1d08697bc1
[FIX] Do not display language choice if multilang=False
2014-05-12 17:42:01 +02:00
Fabien Meghazi
4a29752451
[IMP] openerpframework moved in common asset bundle
2014-05-12 17:19:34 +02:00
Fabien Meghazi
05c598f0b3
[ADD] website.menu editable list in website config
...
bzr revid: fme@openerp.com-20140512113820-oidhod8ovqp3nh9a
2014-05-12 13:38:20 +02:00
Martin Trigaux
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
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
Fabien Pinckaers
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
Fabien Pinckaers
105618443f
[IMP] Sitemap
...
bzr revid: fp@tinyerp.com-20140511134037-84vnn1b4zfzk8som
2014-05-11 15:40:37 +02:00
Fabien Pinckaers
54d30d5194
[IMP] clean sitemap, enumerate pages + fixes
...
bzr revid: fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4
2014-05-11 13:52:31 +02:00
Fabien Meghazi
501ad7abeb
[IMP] dumb code
...
bzr revid: fme@openerp.com-20140509151855-7v4hp08qvmac1u2d
2014-05-09 17:18:55 +02:00
Fabien Meghazi
7caabb8f75
[MERGE] upsteam
...
bzr revid: fme@openerp.com-20140509144608-btah4s8zorzon2jo
2014-05-09 16:46:08 +02:00
Fabien Meghazi
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
Fabien Meghazi
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
Fabien Meghazi
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
Fabien Meghazi
95e1bd0612
[REM] completetly removed website#preprocess_request()
...
bzr revid: fme@openerp.com-20140507170816-rrnh1nlqf97pfy3k
2014-05-07 19:08:16 +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
Christophe Simonis
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
Antony Lesuisse
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
Fabien Meghazi
ee1fbd17c8
[FIX] jQuery.ui - boostrap conflict
...
bzr revid: fme@openerp.com-20140506153335-x2fwpajvthcru1cv
2014-05-06 17:33:35 +02:00
Fabien Meghazi
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
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
Denis Ledoux
deb091ea64
[FIX] website: missing acl for manage website menu
...
bzr revid: dle@openerp.com-20140502134135-zp05ecbpcj8inftc
2014-05-02 15:41:35 +02:00
chm@openerp.com
ee16b014b1
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140502095132-kfx40xou73mukr2y
2014-05-02 11:51:32 +02:00
Antony Lesuisse
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
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
Antony Lesuisse
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
Fabien Pinckaers
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
Fabien Meghazi
46b422def0
[REM] useless id's in script and links
...
bzr revid: fme@openerp.com-20140430073104-qwb0opveyx5hnplg
2014-04-30 09:31:04 +02:00
Fabien Meghazi
a1d3b7d9ad
[REM] duplicates in assets
...
bzr revid: fme@openerp.com-20140430072102-2nzi1lcm95exb6v4
2014-04-30 09:21:02 +02:00
Fabien Meghazi
45aba13ed5
[FIX] bootstrap-tour removed
...
bzr revid: fme@openerp.com-20140429161604-dq0ny7bjioe6bjg3
2014-04-29 18:16:04 +02:00
Fabien Meghazi
b7003a382a
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +02:00
Fabien Meghazi
c92e1b6bcb
[IMP] Rename assets_frontend
...
bzr revid: fme@openerp.com-20140429145745-t3u41tzv6qnndlla
2014-04-29 16:57:45 +02:00
Olivier Dony
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
Olivier Dony
81c251836d
[FIX] website: grant edit rights to website manager
...
bzr revid: odo@openerp.com-20140429123517-wtjcw6xl8qgtnkeg
2014-04-29 14:35:17 +02:00
Fabien Meghazi
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
Fabien Meghazi
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
Fabien Meghazi
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
Fabien Meghazi
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
Fabien Meghazi
4f16d15120
[IMP] rename editor assets
...
bzr revid: fme@openerp.com-20140425101753-gz6c8q9huw9c04yp
2014-04-25 12:17:53 +02:00
Fabien Meghazi
0efb6fc28b
[FIX] Inverse logic for /page/website.<id> shortcut
...
bzr revid: fme@openerp.com-20140425083521-8rd1u3y4da8sf89i
2014-04-25 10:35:21 +02:00
chm@openerp.com
13469c23d8
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140424135841-akc01inl26fcirwy
2014-04-24 15:58:41 +02:00
Christophe Simonis
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
Olivier Dony
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
chm@openerp.com
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
chm@openerp.com
ee7ff4bd07
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140423154852-gzegxqrzb2sj01zl
2014-04-23 17:48:52 +02:00
Fabien Meghazi
1d8400418e
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140423123744-zfz7k8drn2t624zu
2014-04-23 14:37:44 +02:00
chm@openerp.com
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
Christophe Simonis
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
Fabien Meghazi
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
Christophe Simonis
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
Fabien Meghazi
0ec498371e
[FIX] translatable condition on *.editor.js assets
...
bzr revid: fme@openerp.com-20140422141656-r9cx0z7mkwhe51hp
2014-04-22 16:16:56 +02:00
Fabien Meghazi
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
Fabien Meghazi
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
Fabien Pinckaers
cbf071a62c
[IMP] better layout for documentation
...
bzr revid: fp@tinyerp.com-20140421144510-9qo1whru5u5ec721
2014-04-21 16:45:10 +02:00
chm@openerp.com
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
Xavier Morel
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
Kunal Chavda
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
Thibault Delavallée
2fdc1d1905
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140416111721-g2vw6140a3adhk6y
2014-04-16 13:17:21 +02:00
Thibault Delavallée
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
Kersten Jeremy
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
Kersten Jeremy
c4164204b5
[FIX] Website - fix path of script watch.js
...
bzr revid: jke@openerp.com-20140416083411-a06k9sbiyda7zmrd
2014-04-16 10:34:11 +02:00
chm@openerp.com
dbe1b81d15
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140416074634-jkcn3ae30q9uqnsi
2014-04-16 09:46:34 +02:00
chm@openerp.com
9c0526b1bd
[FIX] website tour: test mode + add log
...
bzr revid: chm@openerp.com-20140415153734-5n2sz3xn01ydfeh6
2014-04-15 17:37:34 +02:00
Christophe Simonis
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
Kersten Jeremy
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
Kersten Jeremy
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
Kersten Jeremy
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
Kersten Jeremy
faa899adde
[FIX] Reactive watcher
...
bzr revid: jke@openerp.com-20140414163412-88seef6j58xiamug
2014-04-14 18:34:12 +02:00
Kersten Jeremy
552a23a4bd
[FIX] Remove watcher
...
bzr revid: jke@openerp.com-20140414153537-0qjlnqqnk0q9utn0
2014-04-14 17:35:37 +02:00
Kersten Jeremy
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
Kersten Jeremy
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
chm@openerp.com
1b6585e614
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140414081610-h4qzg0okrwrxggar
2014-04-14 10:16:10 +02:00
chm@openerp.com
3f7e567acc
[FIX] website
...
bzr revid: chm@openerp.com-20140414081451-0hzjgaewtcok6rod
2014-04-14 10:14:51 +02:00
Richard Mathot (OpenERP)
23abadb62b
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140411124318-pgxdmjfidsyny2ob
2014-04-11 14:43:18 +02:00
chm@openerp.com
a2f62bc341
[FIX] website tour: error log
...
bzr revid: chm@openerp.com-20140411123305-t2n1aej9akn0zb5r
2014-04-11 14:33:05 +02:00
Fabien Pinckaers
63c2093d2c
[IMP] Larger texts
...
bzr revid: fp@tinyerp.com-20140411122232-s8yipnar4tllspm0
2014-04-11 14:22:32 +02:00
Richard Mathot (OpenERP)
8ce4ac4d94
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140411115525-87b9wa1ttwphiwf2
2014-04-11 13:55:25 +02:00
chm@openerp.com
ab5aa5daff
[FIX] website tour: write undefined in log
...
bzr revid: chm@openerp.com-20140411115502-804e5669do02swm2
2014-04-11 13:55:02 +02:00
chm@openerp.com
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
chm@openerp.com
584f2bea07
[IMP] website: Tour: add a log time
...
bzr revid: chm@openerp.com-20140411105105-y7vxgkf7nydjb1f8
2014-04-11 12:51:05 +02:00
Kunal Chavda (Open ERP)
a7dae4e741
[MERGE]with latest trunk.
...
bzr revid: kch@tinyerp.com-20140411093642-6o1luwd111qwtirn
2014-04-11 15:06:42 +05:30
chm@openerp.com
1fc8f89bc1
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140411082050-lr7vtew6yvsqaon6
2014-04-11 10:20:50 +02:00
chm@openerp.com
aaa3265f47
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140411081401-0ybuuboo6f3b58kv
2014-04-11 10:14:01 +02:00
Kunal Chavda (Open ERP)
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
Olivier Dony
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
chm@openerp.com
7298130f31
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140410152925-ndajhnyh4rt8pkgu
2014-04-10 17:29:25 +02:00
Richard Mathot (OpenERP)
8ff2bb683f
[MERGE][FIX] Mobile preview of blogs
...
bzr revid: rim@openerp.com-20140414144407-cz3fmydj8vpzl7n6
2014-04-14 16:44:07 +02:00
Kersten Jeremy
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
Kersten Jeremy
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
chm@openerp.com
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
Richard Mathot (OpenERP)
ac8ada1a47
[MERGE] Sync with parent
...
bzr revid: rim@openerp.com-20140410120341-n1idn9rtnf2lmvcy
2014-04-10 14:03:41 +02:00
Christophe Simonis
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
Vidhin Mehta (OpenERP)
9f6def6408
[TEST]for test on runbot.
...
bzr revid: vme@tinyerp.com-20140410105643-ndznhar8a6x6uevg
2014-04-10 16:26:43 +05:30
Kunal Chavda (Open ERP)
0be5ebf9d6
[MERGE]with latest trunk.
...
bzr revid: kch@tinyerp.com-20140410094107-27ey4hms034mob6k
2014-04-10 15:11:07 +05:30
Kunal Chavda (Open ERP)
ae8f388ded
[FIX]forgot to change variable name.
...
bzr revid: kch@tinyerp.com-20140410092901-3422iz7nam26xr9c
2014-04-10 14:59:01 +05:30
Richard Mathot (OpenERP)
e29174090a
[MERGE] Sync with trunk
...
bzr revid: richard_mathot_openerp-20140409194248-ii36xsv0lpr68rmt
2014-04-09 21:42:48 +02:00
chm@openerp.com
15c035631d
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140409154520-eddr2h21bei95xxu
2014-04-09 17:45:20 +02:00
Raphael Collet
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
chm@openerp.com
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
chm@openerp.com
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
chm@openerp.com
fc48e1a8d2
[TYPO] website: tour for banner
...
bzr revid: chm@openerp.com-20140409133330-6ny4oug0hucpzsn8
2014-04-09 15:33:30 +02:00
chm@openerp.com
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
chm@openerp.com
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
Raphael Collet
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
Thibault Delavallée
d763530ac9
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140409075034-zale7ojgj2fh347l
2014-04-09 09:50:34 +02:00
chm@openerp.com
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
chm@openerp.com
5c5a3c4887
[FIX] website: snippet parallax
...
bzr revid: chm@openerp.com-20140408154926-dq4k4bvmfaq2r6rl
2014-04-08 17:49:26 +02:00
chm@openerp.com
d2407ec8c4
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140408154556-e4ud0kzyfcm13iui
2014-04-08 17:45:56 +02:00
chm@openerp.com
8a3e35e3bb
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140408154510-8snznjqkrdl3jwdg
2014-04-08 17:45:10 +02:00
Richard Mathot (OpenERP)
e423d63e90
[MERGE] Sync with parent
...
bzr revid: rim@openerp.com-20140408140555-m4z8o9onif92f9i8
2014-04-08 16:05:55 +02:00
chm@openerp.com
673dc5b1d7
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140408132412-7ofhd87laj3uoazj
2014-04-08 15:24:12 +02:00
Thibault Delavallée
a59283ecc3
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140408131347-uo0ahmypbxhlx7vv
2014-04-08 15:13:47 +02:00
chm@openerp.com
f4225eda24
[FIX] website test tour
...
bzr revid: chm@openerp.com-20140408124119-jkmeh5vfdb3sjlna
2014-04-08 14:41:19 +02:00
Kersten Jeremy
f3e405fbe1
[FIX] Website snippet - Update carousel to use bootstrap position and size without CSS. Fix bug with slide-to which doesn't work.
...
bzr revid: jke@openerp.com-20140408115424-irsmuhibasonhv7p
2014-04-08 13:54:24 +02:00
chm@openerp.com
7a905238f2
[IMP] website: media editor: don't display id in error message
...
bzr revid: chm@openerp.com-20140408095343-bg9348ieabf3ayp8
2014-04-08 11:53:43 +02:00
chm@openerp.com
81f2c983e5
[IMP] website: media editor: change button on keyup
...
bzr revid: chm@openerp.com-20140408094703-7qayghtm88qku3jz
2014-04-08 11:47:03 +02:00
chm@openerp.com
d15ba59a23
[IMP] website: media editor: placeholder and preview
...
bzr revid: chm@openerp.com-20140408093648-zcx3nj5k068ejrb4
2014-04-08 11:36:48 +02:00
chm@openerp.com
df92252952
[FIX] website media editor: next previous
...
bzr revid: chm@openerp.com-20140408084237-y8yh8cb1gsv94gbo
2014-04-08 10:42:37 +02:00
chm@openerp.com
781e8fbbf0
[IMP] website: add Rounded Border, Box, Circle, Shadow to transform snippet
...
bzr revid: chm@openerp.com-20140408082649-1z79gagload02ol0
2014-04-08 10:26:49 +02:00
chm@openerp.com
be5fe933ec
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140408080736-6b70rlfsvj3to0od
2014-04-08 10:07:36 +02:00
Simon Lejeune
4983f86d81
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140407174534-pk6b5lozvik78fom
2014-04-07 19:45:34 +02:00
chm@openerp.com
a247efb0e4
[FIX] website: media editor fix saved trigger
...
bzr revid: chm@openerp.com-20140407163337-3a3d3kt5l2nmm3gn
2014-04-07 18:33:37 +02:00
Christophe Simonis
0fad8159f3
[MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
...
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
2014-04-07 18:33:18 +02:00
chm@openerp.com
153e31d754
[FIX] website: media editor: add image with topbar
...
bzr revid: chm@openerp.com-20140407144914-50wblp9teywr8wk2
2014-04-07 16:49:14 +02:00
chm@openerp.com
078914371c
[FIX] website: save jquery transform style
...
bzr revid: chm@openerp.com-20140407133750-he0iaor008hvzfim
2014-04-07 15:37:50 +02:00
Simon Lejeune
f99349a165
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140407133532-o6c7vpjsbjsnpsib
2014-04-07 15:35:32 +02:00
chm@openerp.com
ae2a609390
[IMP] website: change translate px in % for snippet transform
...
bzr revid: chm@openerp.com-20140407130229-rcoziy0gbwzl0are
2014-04-07 15:02:29 +02:00
chm@openerp.com
d65b2cff23
[IMP] website: snippet editor, move resize button
...
bzr revid: chm@openerp.com-20140407112330-6cj02vlmcs9gwxst
2014-04-07 13:23:30 +02:00
chm@openerp.com
ad93089bc2
[FIX] website: snippet editor add class from li[data-value]
...
bzr revid: chm@openerp.com-20140407111506-jemffxbanul2yqbk
2014-04-07 13:15:06 +02:00
chm@openerp.com
618a52116c
[FIX] website: media transform: don't move center when rotation
...
bzr revid: chm@openerp.com-20140407105604-t43kg143vqny8l5s
2014-04-07 12:56:04 +02:00
chm@openerp.com
c7a16d134b
[FIX] website: media editor, editor position
...
bzr revid: chm@openerp.com-20140407102419-u5lrqefulj7c8ta0
2014-04-07 12:24:19 +02:00
Kunal Chavda (Open ERP)
e06a7036f1
[IMP]Implement effect on close tour like smartsheet.
...
bzr revid: kch@tinyerp.com-20140407084358-xnfsn6vsnnqy3lzf
2014-04-07 14:13:58 +05:30
chm@openerp.com
cdf4636dce
[IMP] website: media editor: remove previous and next button for picto
...
bzr revid: chm@openerp.com-20140407081751-upxilacnt4szk4s6
2014-04-07 10:17:51 +02:00
chm@openerp.com
2f7950f19f
[IMP] website: media editor: insert add button for video loader
...
bzr revid: chm@openerp.com-20140407081159-434frpfqhe1zqrc0
2014-04-07 10:11:59 +02:00
chm@openerp.com
ee4b879536
[IMP] website: media editor: insert add button for image loader and fix try_remove don't remove image
...
bzr revid: chm@openerp.com-20140407074922-zri6j4u9sw52nkkw
2014-04-07 09:49:22 +02:00
Richard Mathot (OpenERP)
deae95f6af
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140402073422-u3ysvtln130z0kbr
bzr revid: rim@openerp.com-20140403084250-a3d5vmnsya7jx1qe
bzr revid: rim@openerp.com-20140407073946-nx1648yopw91m7v8
2014-04-07 09:39:46 +02:00
chm@openerp.com
26d62c4e55
[IMP] website: media editor: add feedback when the user try to remove a picture
...
bzr revid: chm@openerp.com-20140407073247-davv0udxz5n5qx35
2014-04-07 09:32:47 +02:00
Fabien Pinckaers
de380aa914
[IMP] button snippet
...
bzr revid: fp@tinyerp.com-20140406132519-eookdnec20c6sg20
2014-04-06 15:25:19 +02:00
Simon Lejeune
51a94afa5e
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140403163851-v3x74jl4ekeszrbr
2014-04-03 18:38:51 +02:00
Simon Lejeune
8bf8e8a01c
[FIX] website ir_qweb: do not crash if request is not bound when rendering a template
...
bzr revid: sle@openerp.com-20140402161349-ecm6pit20j44taf1
2014-04-02 18:13:49 +02:00
Thibault Delavallée
dbbf539879
[FIX] website: fixed image controller, do not try to find
...
website_published items on a model that does not hold this column.
bzr revid: tde@openerp.com-20140402140108-ccatsce8zu2x1j3x
2014-04-02 16:01:08 +02:00
Olivier Dony
f120d6ffb7
[FIX] ir.qweb: avoid errors with function fields of type datetime
...
bzr revid: odo@openerp.com-20140401160623-loj5nsph7tfnn1us
2014-04-01 18:06:23 +02:00
ajay javiya (OpenERP)
7126bc5b50
[MERGE] : with trunk and resolve conflicts
...
bzr revid: aja@tinyerp.com-20140401132534-owbxvwqo6qpodw7e
2014-04-01 18:55:34 +05:30
Fabien Meghazi
00803fd13a
[ADD] website: template reset confirmation
...
bzr revid: fme@openerp.com-20140401094233-9zcuc915l56a7h1h
2014-04-01 11:42:33 +02:00
ajay javiya (OpenERP)
a9ee5d0a79
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140401084327-daftkqduvknsa0rp
2014-04-01 14:13:27 +05:30
Quentin (OpenERP)
0a2a118ba3
[MERGE] website_gengo branch merged, offering the possiblity to translate the website using Gengo
...
bzr revid: qdp-launchpad@openerp.com-20140401073953-p46kottwmk9buhor
2014-04-01 09:39:53 +02:00
Richard Mathot (OpenERP)
f07e0ff8c5
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140401071752-mdhg7kjdhgvju1cb
2014-04-01 09:17:52 +02:00
ajay javiya (OpenERP)
138f5d7f32
[MERGE] : with trunk and resolve conflicts
...
bzr revid: aja@tinyerp.com-20140401052801-4483i0z0ivmrwsbn
2014-04-01 10:58:01 +05:30
chm@openerp.com
fd593a3049
[FIX] website_sale: test tour and activate website_event_sale test
...
bzr revid: chm@openerp.com-20140331151237-ec0j7ywfsbjsw83k
2014-03-31 17:12:37 +02:00
chm@openerp.com
b6ba6d9a9c
[FIX] website: create new page redirect to error 404
...
bzr revid: chm@openerp.com-20140331144123-p3unfkbqm5c0y1sx
2014-03-31 16:41:23 +02:00
chm@openerp.com
583a47b7b9
[IMP] website: media editor: add embed video
...
bzr revid: chm@openerp.com-20140331135558-ulr1nzhwwvcnwswm
2014-03-31 15:55:58 +02:00
chm@openerp.com
e0d33ad3c5
[FIX] website editor: shop tour and media editor for field image
...
bzr revid: chm@openerp.com-20140331133340-vj67s9hlptum0h19
2014-03-31 15:33:40 +02:00
chm@openerp.com
e81c205b18
[FIX] website: snippet: link carousel-control
...
bzr revid: chm@openerp.com-20140331130304-v1winnhp41agb030
2014-03-31 15:03:04 +02:00
Fabien Pinckaers
ed037b8a94
[REM] removed bootstrap sources
...
bzr revid: fp@tinyerp.com-20140331124809-t15wswgjj0c6if3y
2014-03-31 14:48:09 +02:00
Parth Gajjar (Open ERP)
8bde127659
merged with trunk-addons
...
bzr revid: pga@tinyerp.com-20140331122509-vkpy077tp216molq
2014-03-31 17:55:09 +05:30
chm@openerp.com
880ac90e1b
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140331121654-jsdotezdyi9qwmeb
2014-03-31 14:16:54 +02:00
chm@openerp.com
655142b04b
[IMP] website: media editor: add search result for images
...
bzr revid: chm@openerp.com-20140331120906-0qqa40xbvek27z4j
2014-03-31 14:09:06 +02:00
chm@openerp.com
1c4b7e9f6f
[FIX] website: snippet slider slide button
...
bzr revid: chm@openerp.com-20140331115139-oa8va3ceikgc5b8w
2014-03-31 13:51:39 +02:00
chm@openerp.com
4281a3f89f
[FIX] website: snippet typo of resize button
...
bzr revid: chm@openerp.com-20140331101043-0mf3c6pndz133huy
2014-03-31 12:10:43 +02:00
chm@openerp.com
fa6cb6d6a2
[FIX] website media editor button position
...
bzr revid: chm@openerp.com-20140331100110-ue68pnnzaxusfu1u
2014-03-31 12:01:10 +02:00
chm@openerp.com
f97a237b4b
[WIP] website: media editor
...
bzr revid: chm@openerp.com-20140331095253-zftyl4uvd56mpovj
2014-03-31 11:52:53 +02:00
chm@openerp.com
e94c9eea4e
[WIP] website: media editor
...
bzr revid: chm@openerp.com-20140331081027-v1eikz3ei78xjjqz
2014-03-31 10:10:27 +02:00
Parth Gajjar (Open ERP)
ff1588a46d
[IMP] added new supportable languages, bog solved in config dialog, improved count words dialog
...
bzr revid: pga@tinyerp.com-20140331070625-qtr7l45lnca5rfze
2014-03-31 12:36:25 +05:30
ajay javiya (OpenERP)
c4896f801c
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140331041956-0ots0gkn1d4ffudq
2014-03-31 09:49:56 +05:30
Fabien Pinckaers
fd43cecbda
[REM] remove duplicate snippet: portfolio - image gallery
...
bzr revid: fp@tinyerp.com-20140330190548-cmgypctw8ymzs4yf
2014-03-30 21:05:48 +02:00
Fabien Pinckaers
62ff59ba9f
[IMP] removing glyphicons from bootstrap less
...
bzr revid: fp@tinyerp.com-20140330131040-3athcual00brty26
2014-03-30 15:10:40 +02:00
Fabien Pinckaers
1c3835c83c
[IMP] bootstrap less sources
...
bzr revid: fp@tinyerp.com-20140329202446-tz8b2rvenc6s3ds5
2014-03-29 21:24:46 +01:00
Fabien Pinckaers
2478af1b16
[IMP] better button snippet
...
bzr revid: fp@tinyerp.com-20140329192911-i75v53f0gos8fybm
2014-03-29 20:29:11 +01:00
Fabien Pinckaers
f1131d547b
[IMP] flat design, even for darken
...
bzr revid: fp@tinyerp.com-20140329125635-3ext2zt4y9n2cpua
2014-03-29 13:56:35 +01:00
chm@openerp.com
1a33fb64d5
[WIP] website: media editor
...
bzr revid: chm@openerp.com-20140328154715-alyj4kh33w6v8pgm
2014-03-28 16:47:15 +01:00
chm@openerp.com
31269ba52f
[IMP] website: media editor doubleclick for video and begin to use snippet builder
...
bzr revid: chm@openerp.com-20140328141619-x9okgixai2v5dekr
2014-03-28 15:16:19 +01:00
Parth Gajjar (Open ERP)
3de6738dbb
merged with trunk addons
...
bzr revid: pga@tinyerp.com-20140328131822-0kc0f5j5qhupkhbr
2014-03-28 18:48:22 +05:30
chm@openerp.com
b0625b1191
[IMP] website: add video media editor
...
bzr revid: chm@openerp.com-20140328104453-2faynhhc1wi5598l
2014-03-28 11:44:53 +01:00
ajay javiya (OpenERP)
e63646130e
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140328042815-kv5qmuh2wxdt9wwp
2014-03-28 09:58:15 +05:30
chm@openerp.com
e289e23298
[WIP] website media editor
...
bzr revid: chm@openerp.com-20140327171417-nz2cd8tn2dmmljge
2014-03-27 18:14:17 +01:00
chm@openerp.com
c8d0175e61
[IMP] website media editor: change template
...
bzr revid: chm@openerp.com-20140327160324-yb1cwpsgqymxsf83
2014-03-27 17:03:24 +01:00
Fabien Meghazi
cf311bda60
[MERGE] remote module import
...
bzr revid: fme@openerp.com-20140327141233-i7xu8ism7howhflv
2014-03-27 15:12:33 +01:00
Parth Gajjar (Open ERP)
2de4260240
merged with trunk-addons
...
bzr revid: pga@tinyerp.com-20140327113805-2ie66rru6o10nv38
2014-03-27 17:08:05 +05:30
chm@openerp.com
c15e5b5163
[WIP] website media editor
...
bzr revid: chm@openerp.com-20140327105103-r4laze34bf0z62o2
2014-03-27 11:51:03 +01:00
chm@openerp.com
94cf489dfc
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140327095038-ycs4991u11o9oywv
2014-03-27 10:50:38 +01:00
chm@openerp.com
740e35e56d
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140327094902-nko6rc1cs97b4sd1
2014-03-27 10:49:02 +01:00
chm@openerp.com
c1b6589851
[IMP] website_event: widget to promote Events with country flag
...
bzr revid: chm@openerp.com-20140327093517-8ppcxypc6krxc2fi
2014-03-27 10:35:17 +01:00
Fabien Meghazi
b7fbef1241
[FIX] Serve ir.attachment with SUPERUSER_ID
...
We are not supposed to have a user id here
bzr revid: fme@openerp.com-20140326184022-1hulv7t5y6vuvr9y
2014-03-26 19:40:22 +01:00
chm@openerp.com
9bb510938f
[WIP] website: media editor for image
...
bzr revid: chm@openerp.com-20140326160701-6wf21suhkv4rimyw
2014-03-26 17:07:01 +01:00
chm@openerp.com
a7dc05bf6e
[WIP] website: add media editor template
...
bzr revid: chm@openerp.com-20140326155822-f4wascgyrm7ffeg8
2014-03-26 16:58:22 +01:00
Fabien Meghazi
eb5cbea318
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140326152433-vegu5tuvr8vc1s8v
2014-03-26 16:24:33 +01:00
chm@openerp.com
368bf4dff6
[FIX] website editor: color of style button
...
bzr revid: chm@openerp.com-20140326143655-33sm4i67zjn03o2c
2014-03-26 15:36:55 +01:00
chm@openerp.com
aa63c56462
[IMP] website editor: add style button on image
...
bzr revid: chm@openerp.com-20140326141629-diz4rk0789no7yyl
2014-03-26 15:16:29 +01:00
chm@openerp.com
b39be63a8b
[IMP] website: fix and add rotationStep option for jsuery transfo
...
bzr revid: chm@openerp.com-20140326124339-ll12dxd2qyo3gpi3
2014-03-26 13:43:39 +01:00
Parth Gajjar (Open ERP)
473243270b
[MERGE] merged with trunk addons
...
bzr revid: pga@tinyerp.com-20140326112709-m1iqkkmjt1xtmio1
2014-03-26 16:57:09 +05:30
chm@openerp.com
99ac3ff81b
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140326105539-9hf1x7u6lvh2hq2f
2014-03-26 11:55:39 +01:00
chm@openerp.com
26692117b6
[ADD] website: add jQuery.transfo.js to transform dom (rotation, scale, translate)
...
bzr revid: chm@openerp.com-20140326105345-rq58x39zl6wi6a7s
2014-03-26 11:53:45 +01:00
Richard Mathot (OpenERP)
dbd36f318c
[FIX] Rem old merged code (SHOULD NOT BE MERGED INTO TRUNK)
...
bzr revid: rim@openerp.com-20140326084646-0vutq1anyeju3w2y
2014-03-26 09:46:46 +01:00
ajay javiya (OpenERP)
864892d6ce
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140326054841-9yoaub8fw058vjkm
2014-03-26 11:18:41 +05:30
Fabien Meghazi
0fe55dddc1
[IMP] Added a mimetype field in ir.attachment
...
bzr revid: fme@openerp.com-20140325160413-jvxjii6rbqcrjxor
2014-03-25 17:04:13 +01:00
Richard Mathot (OpenERP)
6e25b1fc3f
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140325152935-hifgmzdl63yhmkll
2014-03-25 16:29:35 +01:00
chm@openerp.com
0d4d9af5f4
[FIX] website: fix and activate frontend test
...
bzr revid: chm@openerp.com-20140325140328-3f5is66d0petqrl6
2014-03-25 15:03:28 +01:00
Fabien Meghazi
329c19f94e
[FIX] Fix url slug check bug in multilang=True
...
bzr revid: fme@openerp.com-20140325140026-0qdx9zl21za8gto9
2014-03-25 15:00:26 +01:00
ajay javiya (OpenERP)
f76a734e90
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140325114109-lts5z42lq9xlgqx0
2014-03-25 17:11:09 +05:30
Fabien Meghazi
8435da41bc
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140325103928-ja3bqy6xmyp91gva
2014-03-25 11:39:28 +01:00
Fabien Meghazi
27f38edb25
[FIX] dirty saas-3 fix for url lang switching with model converters
...
bzr revid: fme@openerp.com-20140325100722-temaci88fowcr2m5
2014-03-25 11:07:22 +01:00
Richard Mathot (OpenERP)
631532072d
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140325085451-rscgni01o54123fm
2014-03-25 09:54:51 +01:00
chm@openerp.com
13d7cfe86c
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140324082341-d6gqyloc7822aen2
bzr revid: chm@openerp.com-20140325084852-i1yomuyhyen4ss95
2014-03-25 09:48:52 +01:00
Fabien Pinckaers
fa46f255f2
[IMP] wording
...
bzr revid: fp@tinyerp.com-20140324203540-rx76yaqaw3p9aql9
2014-03-24 21:35:40 +01:00
Simon Lejeune
6889165eb1
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140324164409-452kibtg3l7rd0nj
2014-03-24 17:44:09 +01:00
Simon Lejeune
9556cadbff
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140324162043-dzdwcxdt32sfjy57
2014-03-24 17:20:43 +01:00
Fabien Meghazi
bb8b7ea2d9
[ADD] website ir_http: serve binary ir.attchments with urls
...
bzr revid: fme@openerp.com-20140324151728-hpegewvf3b38ndyi
2014-03-24 16:17:28 +01:00
Fabien Meghazi
9285813da9
[IMP] website images: only checksum ir.attachment for empty urls
...
bzr revid: fme@openerp.com-20140324151447-a3mkncjh0b7k16hg
2014-03-24 16:14:47 +01:00
chm@openerp.com
e5f645df4d
[FIX] website: snippet editor: forward port of branch saas-3
...
bzr revid: chm@openerp.com-20140324145416-qn2fvylylxtgu39a
2014-03-24 15:54:16 +01:00
Simon Lejeune
50fda546e2
[REF] Moved qweb contact from website to base and removed the from_html method (it never worked)
...
bzr revid: sle@openerp.com-20140324135933-f21heo0sz0tzjbv3
2014-03-24 14:59:33 +01:00
chm@openerp.com
5692dbdb5e
[IMP] website: Building block / Snippet Editor
...
Add documentation and clean framework
The building blocks appear in the edit bar website. These prebuilt html block allowing the designer to easily generate content on a page (drag and drop).
Options allow snippets to add customizations party html code according to their selector (jQuery) and javascript object.
bzr revid: chm@openerp.com-20140324135220-j0abaam1n4ue03l7
2014-03-24 14:52:20 +01:00
chm@openerp.com
449ca3ab18
[IMP] website snippet: add example in documentation
...
bzr revid: chm@openerp.com-20140324135013-1fr3kznkw29wvca2
2014-03-24 14:50:13 +01:00
Christophe Simonis
d93b79e6f4
[MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
...
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
2014-03-24 14:38:11 +01:00
chm@openerp.com
ba55fcf1d0
[IMP] website: Building block / Snippet Editor
...
Add documentation and clean framework
The building blocks appear in the edit bar website. These prebuilt html block allowing the designer to easily generate content on a page (drag and drop).
Options allow snippets to add customizations party html code according to their selector (jQuery) and javascript object.
bzr revid: chm@openerp.com-20140324130119-xbnejtayna8haykk
2014-03-24 14:01:19 +01:00
Parth Gajjar (Open ERP)
69e6a7a808
[IMP] send source url in gengo comment, and save page on gengo post
...
bzr revid: pga@tinyerp.com-20140324111253-xts034vw3rjjl1cb
2014-03-24 16:42:53 +05:30
Parth Gajjar (Open ERP)
bf0d35dbdd
[IMP] merged gengo translator with main translator, removed 'Restart Job' from wizard,removed constraint from base_gengo
...
bzr revid: pga@tinyerp.com-20140324103631-j4cswrlk5huuibt5
2014-03-24 16:06:31 +05:30
Xavier Morel
aa9387e845
[FIX] don't mark view sections as dirty just because the snippets thing has inserted drop zones in it
...
bzr revid: xmo@openerp.com-20140324101850-el3cfs0x4uln3u7v
2014-03-24 11:18:50 +01:00
chm@openerp.com
62814f9c23
[FIX] website: activate new tour tests
...
bzr revid: chm@openerp.com-20140324081112-15n58puu29weydme
2014-03-24 09:11:12 +01:00
Fabien Pinckaers
843ac33ad9
[IMP] clean css
...
bzr revid: fp@tinyerp.com-20140322185641-qy57fotd1uvztffy
2014-03-22 19:56:41 +01:00
Fabien Pinckaers
d03a8e8fcd
[IMP] removed history wizard, avatar handling
...
bzr revid: fp@tinyerp.com-20140322175329-s0uum9gircwryg09
2014-03-22 18:53:29 +01:00
chm@openerp.com
24d37e2844
[FIX] website tour: template loading hide the real error
...
bzr revid: chm@openerp.com-20140321134546-i5nw73en8thzrwc2
2014-03-21 14:45:46 +01:00
chm@openerp.com
f9b0c7469a
[IMP] website tour: change syntax
...
bzr revid: chm@openerp.com-20140321134207-y54uj2fynl5p0e8a
2014-03-21 14:42:07 +01:00
chm@openerp.com
89a6bd0649
[IMP] website tour: fix auto test
...
bzr revid: chm@openerp.com-20140321123722-dmfdckh59cvot00i
2014-03-21 13:37:22 +01:00
Simon Lejeune
6b5986e34d
[FIX] ir_http website postprocess args: do not redirect if the only difference between the url and the post-processed url is the url-enconding of some characters
...
bzr revid: sle@openerp.com-20140321120133-0k1zjsrtgwrw6oon
2014-03-21 13:01:33 +01:00
chm@openerp.com
d8f27686e5
[IMP] website tour: fix test tour
...
bzr revid: chm@openerp.com-20140321115724-iwu17fkzdzaksmrs
2014-03-21 12:57:24 +01:00
chm@openerp.com
429324999c
[IMP] website tour: remove tag script and css to lib bootstrap
...
bzr revid: chm@openerp.com-20140321112344-mwh2p8pp02j9sdq0
2014-03-21 12:23:44 +01:00
chm@openerp.com
254b3a29fa
[IMP] website tour: auto set backdrop if no selector element
...
bzr revid: chm@openerp.com-20140321111815-t0312xxl7l83w9rx
2014-03-21 12:18:15 +01:00
chm@openerp.com
58b6aeb01d
[IMP] website tour: remove bootstrap Tour lib
...
bzr revid: chm@openerp.com-20140321110750-ew8rj3nv2jcort1x
2014-03-21 12:07:50 +01:00
Xavier Morel
a56dc53bea
[REM] 4-spaces indent for web view pretty-print-before-save routine
...
Didn't quite work right: on the layout, it would exponentially increase
leading spaces in text nodes. Combined with a bug injecting snippets marks in
the footer (and thus invalidating and re-saving the layout at each snippet
addition) this could blow up the layout template and rendered page to >20MB.
Just keep lxml's standard 2-spaces indent.
LXML is unable to pretty print the layout anyway.
bzr revid: xmo@openerp.com-20140321075419-9w88h232r928xv5f
2014-03-21 08:54:19 +01:00
Denis Ledoux
30853afd18
[FIX] website: prevent animations in edit mode
...
bzr revid: dle@openerp.com-20140321150800-q8p8hn8a7aozcya4
2014-03-21 16:08:00 +01:00
chm@openerp.com
abfccd8936
[WIP] website tour: bootstrap-tour - v0.9.1
...
bzr revid: chm@openerp.com-20140320151542-blfr1rs1j24xanh8
2014-03-20 16:15:42 +01:00
Parth Gajjar (Open ERP)
ac8babe0e5
[IMP] minor changes
...
bzr revid: pga@tinyerp.com-20140320120758-ojgqpqb8sakdhkbb
2014-03-20 17:37:58 +05:30
Parth Gajjar (Open ERP)
e45d9bc7b0
[IMP] removed unnecessary code
...
bzr revid: pga@tinyerp.com-20140320094434-4zp7x6dmd27wfza2
2014-03-20 15:14:34 +05:30
Parth Gajjar (Open ERP)
a378f547f4
[IMP] minor changes
...
bzr revid: pga@tinyerp.com-20140320092643-1pw62dmbj9h6sjh4
2014-03-20 14:56:43 +05:30
chm@openerp.com
0b75d4ea04
[IMP] website: remove bootstrap_tour_stub
...
bzr revid: chm@openerp.com-20140320085606-qrghlkev6i9pu9bw
2014-03-20 09:56:06 +01:00
chm@openerp.com
60bdd78706
[IMP] website tour: refactoring and change api for create tour and test
...
bzr revid: chm@openerp.com-20140320083055-z5ys4oey5brd439v
2014-03-20 09:30:55 +01:00
Parth Gajjar (Open ERP)
b7a68828ed
[IMP] improved statistics, added sendbox options for testing, improved UI
...
bzr revid: pga@tinyerp.com-20140320071028-adyh8d89o7dij81o
2014-03-20 12:40:28 +05:30
Parth Gajjar (Open ERP)
b8d87606f0
[IMP] added gengo statistics, displayed inprogress elements
...
bzr revid: pga@tinyerp.com-20140319133121-31umju0ea84sm93y
2014-03-19 19:01:21 +05:30
chm@openerp.com
00aa1b69dc
[FIX] website tour: don't hide error in test mode if openerp don't exist
...
bzr revid: chm@openerp.com-20140319102348-rb1tkgd14nca6o15
2014-03-19 11:23:48 +01:00
chm@openerp.com
b80d06d327
[FIX] website tour: reset tour before console.log 'ok' or 'error' who close phantomjs tour
...
bzr revid: chm@openerp.com-20140319092012-v83w99ts6z0apgl0
2014-03-19 10:20:12 +01:00
Dharmraj Jhala (OpenERP)
e07861bb19
[MERGE] with latest trunk addons
...
bzr revid: dizzy.zala@gmail.com-20140319090139-1eaj26atlah94n7y
2014-03-19 14:31:39 +05:30
chm@openerp.com
a762af1f21
[FIX] website_sale: payment get status url (ending slash); fix debbuger template url scripts
...
bzr revid: chm@openerp.com-20140319085700-b4v9iu51a9jtzty3
2014-03-19 09:57:00 +01:00
Richard Mathot (OpenERP)
ecc7c1fbd3
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140319072330-lvlrxsqq667hfu28
2014-03-19 08:23:30 +01:00
chm@openerp.com
ed2743f755
merge upstream
...
bzr revid: chm@openerp.com-20140318161114-4t331xpt4xeitgxo
2014-03-18 17:11:14 +01:00
Parth Gajjar (Open ERP)
c49befd59f
[ADD] added website_gengo module
...
bzr revid: pga@tinyerp.com-20140318133036-j1hcrz7bybolw44u
2014-03-18 19:00:36 +05:30
Christophe Simonis
99a3c45976
[MERGE] forward port of branch saas-3 up to revid 9328 chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
...
bzr revid: chs@openerp.com-20140318132741-aur3q1k7t9iympri
2014-03-18 14:27:41 +01:00
chm@openerp.com
1395c9ee0e
[IMP] website: snippet editor: change size automatic button into a cross between resize handler
...
bzr revid: chm@openerp.com-20140318130414-yb29wtm7oo4bammz
2014-03-18 14:04:14 +01:00
chm@openerp.com
f9579073fe
[FIX] website: color of Edit Master link for themes. CSS less specific
...
bzr revid: chm@openerp.com-20140318111442-mbrhrmtnwy3uxc5y
2014-03-18 12:14:42 +01:00
chm@openerp.com
abe8e7208e
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140318102102-ug0ny6q360i4o1e6
2014-03-18 11:21:02 +01:00
Kersten Jeremy
77622d3b24
[FIX] Fix css which make unusable the option dropdown for unpublished product. When an user was hover on a product not published and was trying to go in submenu, he had lost cursor, because he was changing div due to opacoty little than 1.
...
bzr revid: jke@openerp.com-20140318092341-ncgb173y0xfiaj87
2014-03-18 10:23:41 +01:00
Richard Mathot (OpenERP)
39f3264e53
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140318075419-qkw5odjmgi58n0rj
2014-03-18 08:54:19 +01:00
Dharmraj Jhala (OpenERP)
3566b69374
[MERGE] with latest trunk addons
...
bzr revid: dizzy.zala@gmail.com-20140318065716-m8wxkwonpu7gpp3a
2014-03-18 12:27:16 +05:30
Xavier Morel
5196cd6e8c
[FIX] website: set inherit_branding in test contexts to trigger generation of relevant edition attributes
...
bzr revid: xmo@openerp.com-20140317152502-6a2agi1xjooi516e
2014-03-17 16:25:02 +01:00