05c598f0b3
[ADD] website.menu editable list in website config
...
bzr revid: fme@openerp.com-20140512113820-oidhod8ovqp3nh9a
2014-05-12 13:38:20 +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
c4164204b5
[FIX] Website - fix path of script watch.js
...
bzr revid: jke@openerp.com-20140416083411-a06k9sbiyda7zmrd
2014-04-16 10:34:11 +02:00
dbe1b81d15
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140416074634-jkcn3ae30q9uqnsi
2014-04-16 09:46:34 +02:00
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
9c739f12c2
[FIX] Remove watcher, need to be review because it breaks other tests.
...
bzr revid: jke@openerp.com-20140414165721-i8g23jxy66p1p6ao
2014-04-14 18:57:21 +02:00
faa899adde
[FIX] Reactive watcher
...
bzr revid: jke@openerp.com-20140414163412-88seef6j58xiamug
2014-04-14 18:34:12 +02:00
552a23a4bd
[FIX] Remove watcher
...
bzr revid: jke@openerp.com-20140414153537-0qjlnqqnk0q9utn0
2014-04-14 17:35:37 +02:00
a8ce5415ad
[FIX] Watch if jQuery is overwritted by another version in some script. If an override is detected, we check that all old function is always present else we add the missing.
...
The problem was that some websites uses externals libraries which use a jQuery more recent that our version. Jquery by default checks his own version and overwrite itself if the current version is lower.
Once user had their jquery overwritted, function dropdown was missing and it was impossible to the end user to get menu working again... and so impossible to remove the view with the front end.
bzr revid: jke@openerp.com-20140414151423-zhi3tjj52rihltzy
2014-04-14 17:14:23 +02:00
1b6585e614
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140414081610-h4qzg0okrwrxggar
2014-04-14 10:16:10 +02:00
23abadb62b
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140411124318-pgxdmjfidsyny2ob
2014-04-11 14:43:18 +02:00
63c2093d2c
[IMP] Larger texts
...
bzr revid: fp@tinyerp.com-20140411122232-s8yipnar4tllspm0
2014-04-11 14:22:32 +02:00
1fc8f89bc1
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140411082050-lr7vtew6yvsqaon6
2014-04-11 10:20:50 +02:00
afc2685cee
[FIX] wesbite: banner - remove css and use bootstrap for positionning. Now hidden-xs works, we don't lost 50% of width
...
bzr revid: jke@openerp.com-20140414142631-k78shkqjqdtcnp83
2014-04-14 16:26:31 +02:00
e29174090a
[MERGE] Sync with trunk
...
bzr revid: richard_mathot_openerp-20140409194248-ii36xsv0lpr68rmt
2014-04-09 21:42:48 +02:00
15c035631d
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140409154520-eddr2h21bei95xxu
2014-04-09 17:45:20 +02:00
f090689984
[FIX] website: The separator block is not working (no drop zone)
...
bzr revid: chm@openerp.com-20140409140733-ne0frg4o7b3c1lr0
2014-04-09 16:07:33 +02:00
4347df6e4d
[FIX] website: Default Url not correct for the button 'contact us' in the block features>Button
...
bzr revid: chm@openerp.com-20140409134143-aoiqbd2aqe78hgyc
2014-04-09 15:41:43 +02:00
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
673dc5b1d7
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140408132412-7ofhd87laj3uoazj
2014-04-08 15:24:12 +02:00
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
df92252952
[FIX] website media editor: next previous
...
bzr revid: chm@openerp.com-20140408084237-y8yh8cb1gsv94gbo
2014-04-08 10:42:37 +02:00
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
be5fe933ec
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140408080736-6b70rlfsvj3to0od
2014-04-08 10:07:36 +02:00
c7a16d134b
[FIX] website: media editor, editor position
...
bzr revid: chm@openerp.com-20140407102419-u5lrqefulj7c8ta0
2014-04-07 12:24:19 +02:00
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
de380aa914
[IMP] button snippet
...
bzr revid: fp@tinyerp.com-20140406132519-eookdnec20c6sg20
2014-04-06 15:25:19 +02:00
00803fd13a
[ADD] website: template reset confirmation
...
bzr revid: fme@openerp.com-20140401094233-9zcuc915l56a7h1h
2014-04-01 11:42:33 +02:00
f07e0ff8c5
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140401071752-mdhg7kjdhgvju1cb
2014-04-01 09:17:52 +02:00
e81c205b18
[FIX] website: snippet: link carousel-control
...
bzr revid: chm@openerp.com-20140331130304-v1winnhp41agb030
2014-03-31 15:03:04 +02:00
880ac90e1b
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140331121654-jsdotezdyi9qwmeb
2014-03-31 14:16:54 +02:00
f97a237b4b
[WIP] website: media editor
...
bzr revid: chm@openerp.com-20140331095253-zftyl4uvd56mpovj
2014-03-31 11:52:53 +02:00
e94c9eea4e
[WIP] website: media editor
...
bzr revid: chm@openerp.com-20140331081027-v1eikz3ei78xjjqz
2014-03-31 10:10:27 +02:00
fd43cecbda
[REM] remove duplicate snippet: portfolio - image gallery
...
bzr revid: fp@tinyerp.com-20140330190548-cmgypctw8ymzs4yf
2014-03-30 21:05:48 +02:00
Fabien Meghazi
Fabien Pinckaers
Antony Lesuisse
Christophe Simonis
Xavier Morel
Kersten Jeremy
chm@openerp.com
Richard Mathot (OpenERP)