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
Olivier Dony
3ad6d69b21
[FIX] website: avoid using werkzeug API only present in 0.9+
...
bzr revid: odo@openerp.com-20140424131415-ot0r5062wndvuicr
2014-04-24 15:14:15 +02:00
Christophe Simonis
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
chm@openerp.com
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
Thibault Delavallée
2fdc1d1905
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140416111721-g2vw6140a3adhk6y
2014-04-16 13:17:21 +02:00
Thibault Delavallée
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
Kersten Jeremy
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
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
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
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
Kersten Jeremy
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
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
Kersten Jeremy
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
chm@openerp.com
aaa3265f47
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140411081401-0ybuuboo6f3b58kv
2014-04-11 10:14:01 +02:00
Olivier Dony
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
Richard Mathot (OpenERP)
8ff2bb683f
[MERGE][FIX] Mobile preview of blogs
...
bzr revid: rim@openerp.com-20140414144407-cz3fmydj8vpzl7n6
2014-04-14 16:44:07 +02:00
Kersten Jeremy
bafa8e448d
[FIX] Website_mail - Add selectors to allow drag and drop of snippet in email template
...
bzr revid: jke@openerp.com-20140414143001-26p3ka7dwb1er6y0
2014-04-14 16:30:01 +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
chm@openerp.com
8da0820a88
[FIX] website: media editor: when the user save the picture, the dialog box re-open automatically. Do not re-active snippet when we save a field image
...
bzr revid: chm@openerp.com-20140414082617-svxpb6kuqfhjm8oa
2014-04-14 10:26:17 +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
Richard Mathot (OpenERP)
8ce4ac4d94
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140411115525-87b9wa1ttwphiwf2
2014-04-11 13:55:25 +02:00
Richard Mathot (OpenERP)
ac8ada1a47
[MERGE] Sync with parent
...
bzr revid: rim@openerp.com-20140410120341-n1idn9rtnf2lmvcy
2014-04-10 14:03:41 +02:00
Christophe Simonis
3a7e003656
[MERGE] forward port of branch saas-3 up to revid 9394 chs@openerp.com-20140410103638-x7vajn70ewsfp0ck
...
bzr revid: chs@openerp.com-20140410110424-enhdg6pufhii56ni
2014-04-10 13:04:24 +02:00
Vidhin Mehta (OpenERP)
9f6def6408
[TEST]for test on runbot.
...
bzr revid: vme@tinyerp.com-20140410105643-ndznhar8a6x6uevg
2014-04-10 16:26:43 +05:30
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
Raphael Collet
48e5bb9075
[MERGE] test_cursor: adapt code to small api changes in registry for handling http tests
...
bzr revid: rco@openerp.com-20140409150002-le29vuu4x41j61q6
2014-04-09 17:00:02 +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
fc48e1a8d2
[TYPO] website: tour for banner
...
bzr revid: chm@openerp.com-20140409133330-6ny4oug0hucpzsn8
2014-04-09 15:33:30 +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
4dc3b139f3
[IMP] ir_qweb, ir_ui_view: can use id insead of xml_id; can render ir.ui.view many2one with widget='qweb' in template
...
bzr revid: chm@openerp.com-20140409104427-ut3r5acavyjsp6bj
2014-04-09 12:44:27 +02:00
Raphael Collet
560166d5a1
[FIX] website/tests: fix test_requests by manually switching registry to test mode
...
bzr revid: rco@openerp.com-20140409092450-2r4gx0eggw2p7lch
2014-04-09 11:24:50 +02:00
Thibault Delavallée
d763530ac9
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140409075034-zale7ojgj2fh347l
2014-04-09 09:50:34 +02:00
chm@openerp.com
3993d1ce2f
[FIX] website: snippet parallax. Error when the user activate a snippet parallax already inserted
...
bzr revid: chm@openerp.com-20140409072813-43fqwcr7j6i0zl0e
2014-04-09 09:28:13 +02:00
chm@openerp.com
5c5a3c4887
[FIX] website: snippet parallax
...
bzr revid: chm@openerp.com-20140408154926-dq4k4bvmfaq2r6rl
2014-04-08 17:49:26 +02:00
chm@openerp.com
d2407ec8c4
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140408154556-e4ud0kzyfcm13iui
2014-04-08 17:45:56 +02:00
Richard Mathot (OpenERP)
e423d63e90
[MERGE] Sync with parent
...
bzr revid: rim@openerp.com-20140408140555-m4z8o9onif92f9i8
2014-04-08 16:05:55 +02:00
chm@openerp.com
673dc5b1d7
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140408132412-7ofhd87laj3uoazj
2014-04-08 15:24:12 +02:00
Thibault Delavallée
a59283ecc3
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140408131347-uo0ahmypbxhlx7vv
2014-04-08 15:13:47 +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
7a905238f2
[IMP] website: media editor: don't display id in error message
...
bzr revid: chm@openerp.com-20140408095343-bg9348ieabf3ayp8
2014-04-08 11:53:43 +02:00
chm@openerp.com
81f2c983e5
[IMP] website: media editor: change button on keyup
...
bzr revid: chm@openerp.com-20140408094703-7qayghtm88qku3jz
2014-04-08 11:47:03 +02:00
chm@openerp.com
d15ba59a23
[IMP] website: media editor: placeholder and preview
...
bzr revid: chm@openerp.com-20140408093648-zcx3nj5k068ejrb4
2014-04-08 11:36:48 +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