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
593cdf427f
Merge remote-tracking branch 'odoo/master' into master-seperate-bundle-fme
2014-05-21 10:29:04 +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
--global
Fabien Meghazi
Christophe Simonis
Christophe Simonis
rim-odoo
Olivier Dony
Xavier Morel
Martin Trigaux
Fabien Pinckaers
Christophe Simonis
Antony Lesuisse
Denis Ledoux