Olivier Dony
34bfa1b44f
[MERGE] Forward-port saas-5 up to d9cda97
2014-07-05 01:45:45 +02:00
Olivier Dony
d9cda97cf4
[MERGE] Forward-port saas-4 up to 5ceded9
2014-07-05 01:28:19 +02:00
Olivier Dony
5ceded9d69
[MERGE] Forward-port saas-3 up to 4fa30f5
2014-07-05 01:04:19 +02:00
Martin Trigaux
a6bf8cd07b
[FIX] website: avoid divisions by zero when no record to display
2014-07-02 16:25:24 +02:00
Simon Lejeune
864962a000
[FIX] only render the navbar when everytging is in rendering context
2014-06-29 15:44:56 +02:00
Simon Lejeune
76039b2a37
[FIX] only render the navbar when website is set (ie not during tests of the reports)
2014-06-27 18:28:34 +02:00
Simon Lejeune
20f4da67b3
Merge remote-tracking branch 'odoo/master' into master-report-translation-fix-sle
2014-06-27 18:17:15 +02:00
Christophe Simonis
1f57528bc6
[MERGE] forward port of branch saas-5 up to 8dfd5ea
2014-06-27 16:14:40 +02:00
Christophe Simonis
8dfd5eab01
[MERGE] forward port of branch saas-4 up to a4bc65c
2014-06-27 16:08:09 +02:00
Christophe Simonis
a4bc65cdba
[MERGE] forward port of branch saas-3 up to bdc4dd4
2014-06-27 16:06:37 +02:00
Olivier Dony
9c5ecd3bc4
[FIX] website: avoid hiding the signin info for users who are not employees nor portal users
...
This happens when you do a plain signup, you
end up as neither an employee nor a portal user,
but should still now when you are logged in.
2014-06-27 13:04:42 +02:00
Simon Lejeune
fc8592adf2
[FIX] Report: translation fixed, use of 'primary clone' of web.layout and website.layout, minimal template is now a QWeb template
2014-06-27 12:00:49 +02:00
Simon Lejeune
195fa93168
[MERGE] backend front end integration
...
Render the top-menu (backend menu or frontend editbar) server-side.
Use Fontawesome icons (mail, timezone, chat).
Refactor website widgets, split Website.editorBarin editorbar, ace, editorbar- content, editorbarCustomize.
2014-06-27 11:03:34 +02:00
Christophe Simonis
8cbaf52fd3
Revert "Saas 5 report translation fix sle"
2014-06-26 18:14:44 +02:00
Simon Lejeune
b8cea9e60f
[REV] revert unneeded changes in website layout
2014-06-26 17:04:16 +02:00
Christophe Matthieu
77a07670cf
[IMP] website: move custom scripts in the assets; fix website_sale_option to display modal in grid view
2014-06-25 14:03:23 +02:00
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
c949509b5e
Merge pull request #463 from xmo-odoo/qweb-foreach
...
Qweb foreach
2014-06-17 15:56:09 +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
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
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
Xavier Morel
a9a83d00c9
[REM] python-qweb support for as-less foreach
2014-06-05 17:49:08 +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
Olivier Dony
04211015fc
[MERGE] Forward-port of latest saas-4 fixes, up to 0452851
2014-05-27 20:49:49 +02:00
Xavier Morel
e06f5b414b
[IMP] inherit_option_id -> application
2014-05-27 12:13:51 +02:00
Richard Mathot
e137a7713b
[FIX] website_sale: test did not load js properly and failed
2014-05-26 16:58:14 +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
--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
Fabien Meghazi
593cdf427f
Merge remote-tracking branch 'odoo/master' into master-seperate-bundle-fme
2014-05-21 10:29:04 +02:00
Christophe Simonis
a756b82372
[MERGE] forward port of branch saas-4 up to revid bb26dea
2014-05-20 20:19:55 +02:00
Fabien Meghazi
863edbaaf2
Seperate assets_common from other bundles
2014-05-20 17:06:25 +02:00
Fabien Meghazi
f90a37ea70
[IMP] sitemap caches it's output in ir.attachment
2014-05-16 15:31:26 +02:00
Fabien Meghazi
828b7aef2f
[WIP] sitemap
2014-05-15 16:58:16 +02:00
Fabien Meghazi
2e0e242c82
[REV] Revert lazy sitemap
2014-05-14 17:11:16 +02:00
Fabien Meghazi
a20ccfc7d4
[FIX] lazy sitemap with generators
2014-05-14 15:48:51 +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
4118f9ed0a
[IMP] openerpframework moved in common asset bundle
2014-05-13 10:18:31 +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
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
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
ee1fbd17c8
[FIX] jQuery.ui - boostrap conflict
...
bzr revid: fme@openerp.com-20140506153335-x2fwpajvthcru1cv
2014-05-06 17:33:35 +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 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
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
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
Fabien Meghazi
1d8400418e
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140423123744-zfz7k8drn2t624zu
2014-04-23 14:37:44 +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
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
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
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
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
chm@openerp.com
1b6585e614
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140414081610-h4qzg0okrwrxggar
2014-04-14 10:16:10 +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
Fabien Pinckaers
63c2093d2c
[IMP] Larger texts
...
bzr revid: fp@tinyerp.com-20140411122232-s8yipnar4tllspm0
2014-04-11 14:22:32 +02:00
chm@openerp.com
1fc8f89bc1
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140411082050-lr7vtew6yvsqaon6
2014-04-11 10:20:50 +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
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
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
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
673dc5b1d7
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140408132412-7ofhd87laj3uoazj
2014-04-08 15:24:12 +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
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
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
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
Fabien Pinckaers
de380aa914
[IMP] button snippet
...
bzr revid: fp@tinyerp.com-20140406132519-eookdnec20c6sg20
2014-04-06 15:25:19 +02:00
Fabien Meghazi
00803fd13a
[ADD] website: template reset confirmation
...
bzr revid: fme@openerp.com-20140401094233-9zcuc915l56a7h1h
2014-04-01 11:42:33 +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
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
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
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
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