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
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
ee7ff4bd07
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140423154852-gzegxqrzb2sj01zl
2014-04-23 17:48:52 +02:00
1d8400418e
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140423123744-zfz7k8drn2t624zu
2014-04-23 14:37:44 +02:00
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
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
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
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
0ec498371e
[FIX] translatable condition on *.editor.js assets
...
bzr revid: fme@openerp.com-20140422141656-r9cx0z7mkwhe51hp
2014-04-22 16:16:56 +02:00
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
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
cbf071a62c
[IMP] better layout for documentation
...
bzr revid: fp@tinyerp.com-20140421144510-9qo1whru5u5ec721
2014-04-21 16:45:10 +02:00
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
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
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
2fdc1d1905
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140416111721-g2vw6140a3adhk6y
2014-04-16 13:17:21 +02:00
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
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
dbe1b81d15
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140416074634-jkcn3ae30q9uqnsi
2014-04-16 09:46:34 +02:00
9c0526b1bd
[FIX] website tour: test mode + add log
...
bzr revid: chm@openerp.com-20140415153734-5n2sz3xn01ydfeh6
2014-04-15 17:37: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
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
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
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
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
1b6585e614
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140414081610-h4qzg0okrwrxggar
2014-04-14 10:16:10 +02:00
3f7e567acc
[FIX] website
...
bzr revid: chm@openerp.com-20140414081451-0hzjgaewtcok6rod
2014-04-14 10:14:51 +02:00
23abadb62b
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140411124318-pgxdmjfidsyny2ob
2014-04-11 14:43:18 +02:00
a2f62bc341
[FIX] website tour: error log
...
bzr revid: chm@openerp.com-20140411123305-t2n1aej9akn0zb5r
2014-04-11 14:33:05 +02:00
63c2093d2c
[IMP] Larger texts
...
bzr revid: fp@tinyerp.com-20140411122232-s8yipnar4tllspm0
2014-04-11 14:22:32 +02:00
8ce4ac4d94
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140411115525-87b9wa1ttwphiwf2
2014-04-11 13:55:25 +02:00
ab5aa5daff
[FIX] website tour: write undefined in log
...
bzr revid: chm@openerp.com-20140411115502-804e5669do02swm2
2014-04-11 13:55:02 +02:00
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
584f2bea07
[IMP] website: Tour: add a log time
...
bzr revid: chm@openerp.com-20140411105105-y7vxgkf7nydjb1f8
2014-04-11 12:51:05 +02:00
a7dae4e741
[MERGE]with latest trunk.
...
bzr revid: kch@tinyerp.com-20140411093642-6o1luwd111qwtirn
2014-04-11 15:06:42 +05:30
1fc8f89bc1
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140411082050-lr7vtew6yvsqaon6
2014-04-11 10:20:50 +02:00
aaa3265f47
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140411081401-0ybuuboo6f3b58kv
2014-04-11 10:14:01 +02:00
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
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
Fabien Meghazi
chm@openerp.com
Christophe Simonis
Fabien Pinckaers
Xavier Morel
Kunal Chavda
Thibault Delavallée
Kersten Jeremy
Richard Mathot (OpenERP)
Olivier Dony