d9cda97cf4
[MERGE] Forward-port saas-4 up to 5ceded9
2014-07-05 01:28:19 +02:00
5ceded9d69
[MERGE] Forward-port saas-3 up to 4fa30f5
2014-07-05 01:04:19 +02:00
a6bf8cd07b
[FIX] website: avoid divisions by zero when no record to display
2014-07-02 16:25:24 +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
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
8cbaf52fd3
Revert "Saas 5 report translation fix sle"
2014-06-26 18:14:44 +02:00
b8cea9e60f
[REV] revert unneeded changes in website layout
2014-06-26 17:04:16 +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
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
9bcda15b97
[FIX] website: prevent to split google analytics script
2014-06-04 16:15:16 +02:00
04211015fc
[MERGE] Forward-port of latest saas-4 fixes, up to 0452851
2014-05-27 20:49:49 +02:00
e06f5b414b
[IMP] inherit_option_id -> application
2014-05-27 12:13:51 +02:00
e137a7713b
[FIX] website_sale: test did not load js properly and failed
2014-05-26 16:58:14 +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
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
863edbaaf2
Seperate assets_common from other bundles
2014-05-20 17:06:25 +02:00
f90a37ea70
[IMP] sitemap caches it's output in ir.attachment
2014-05-16 15:31:26 +02:00
828b7aef2f
[WIP] sitemap
2014-05-15 16:58:16 +02:00
2e0e242c82
[REV] Revert lazy sitemap
2014-05-14 17:11:16 +02:00
a20ccfc7d4
[FIX] lazy sitemap with generators
2014-05-14 15:48:51 +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
4118f9ed0a
[IMP] openerpframework moved in common asset bundle
2014-05-13 10:18:31 +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
54d30d5194
[IMP] clean sitemap, enumerate pages + fixes
...
bzr revid: fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4
2014-05-11 13:52:31 +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
ee1fbd17c8
[FIX] jQuery.ui - boostrap conflict
...
bzr revid: fme@openerp.com-20140506153335-x2fwpajvthcru1cv
2014-05-06 17:33:35 +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
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
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
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
1d8400418e
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140423123744-zfz7k8drn2t624zu
2014-04-23 14:37:44 +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
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
Olivier Dony
Martin Trigaux
Christophe Simonis
Christophe Simonis
Simon Lejeune
Denis Ledoux
Xavier Morel
Richard Mathot
--global
Fabien Meghazi
Fabien Pinckaers
Antony Lesuisse
Christophe Simonis