Commit Graph
2048 Commits
Author SHA1 Message Date
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
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) 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
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
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
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
Simon Lejeune 4983f86d81 [MERGE] trunk
bzr revid: sle@openerp.com-20140407174534-pk6b5lozvik78fom
2014-04-07 19:45:34 +02:00
chm@openerp.com a247efb0e4 [FIX] website: media editor fix saved trigger
bzr revid: chm@openerp.com-20140407163337-3a3d3kt5l2nmm3gn
2014-04-07 18:33:37 +02:00
Christophe Simonis 0fad8159f3 [MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
2014-04-07 18:33:18 +02:00
chm@openerp.com 153e31d754 [FIX] website: media editor: add image with topbar
bzr revid: chm@openerp.com-20140407144914-50wblp9teywr8wk2
2014-04-07 16:49:14 +02:00
chm@openerp.com 078914371c [FIX] website: save jquery transform style
bzr revid: chm@openerp.com-20140407133750-he0iaor008hvzfim
2014-04-07 15:37:50 +02:00
Simon Lejeune f99349a165 [MERGE] trunk
bzr revid: sle@openerp.com-20140407133532-o6c7vpjsbjsnpsib
2014-04-07 15:35:32 +02:00
chm@openerp.com ae2a609390 [IMP] website: change translate px in % for snippet transform
bzr revid: chm@openerp.com-20140407130229-rcoziy0gbwzl0are
2014-04-07 15:02:29 +02:00
chm@openerp.com d65b2cff23 [IMP] website: snippet editor, move resize button
bzr revid: chm@openerp.com-20140407112330-6cj02vlmcs9gwxst
2014-04-07 13:23:30 +02:00
chm@openerp.com ad93089bc2 [FIX] website: snippet editor add class from li[data-value]
bzr revid: chm@openerp.com-20140407111506-jemffxbanul2yqbk
2014-04-07 13:15:06 +02:00
chm@openerp.com 618a52116c [FIX] website: media transform: don't move center when rotation
bzr revid: chm@openerp.com-20140407105604-t43kg143vqny8l5s
2014-04-07 12:56:04 +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
chm@openerp.com cdf4636dce [IMP] website: media editor: remove previous and next button for picto
bzr revid: chm@openerp.com-20140407081751-upxilacnt4szk4s6
2014-04-07 10:17:51 +02:00
chm@openerp.com 2f7950f19f [IMP] website: media editor: insert add button for video loader
bzr revid: chm@openerp.com-20140407081159-434frpfqhe1zqrc0
2014-04-07 10:11:59 +02:00
chm@openerp.com ee4b879536 [IMP] website: media editor: insert add button for image loader and fix try_remove don't remove image
bzr revid: chm@openerp.com-20140407074922-zri6j4u9sw52nkkw
2014-04-07 09:49:22 +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
chm@openerp.com 26d62c4e55 [IMP] website: media editor: add feedback when the user try to remove a picture
bzr revid: chm@openerp.com-20140407073247-davv0udxz5n5qx35
2014-04-07 09:32:47 +02:00
Fabien Pinckaers de380aa914 [IMP] button snippet
bzr revid: fp@tinyerp.com-20140406132519-eookdnec20c6sg20
2014-04-06 15:25:19 +02:00
Simon Lejeune 51a94afa5e [MERGE] trunk
bzr revid: sle@openerp.com-20140403163851-v3x74jl4ekeszrbr
2014-04-03 18:38:51 +02:00
Simon Lejeune 8bf8e8a01c [FIX] website ir_qweb: do not crash if request is not bound when rendering a template
bzr revid: sle@openerp.com-20140402161349-ecm6pit20j44taf1
2014-04-02 18:13:49 +02:00
Thibault Delavallée dbbf539879 [FIX] website: fixed image controller, do not try to find
website_published items on a model that does not hold this column.

bzr revid: tde@openerp.com-20140402140108-ccatsce8zu2x1j3x
2014-04-02 16:01:08 +02:00
Olivier Dony f120d6ffb7 [FIX] ir.qweb: avoid errors with function fields of type datetime
bzr revid: odo@openerp.com-20140401160623-loj5nsph7tfnn1us
2014-04-01 18:06:23 +02:00
ajay javiya (OpenERP) 7126bc5b50 [MERGE] : with trunk and resolve conflicts
bzr revid: aja@tinyerp.com-20140401132534-owbxvwqo6qpodw7e
2014-04-01 18:55:34 +05:30
Fabien Meghazi 00803fd13a [ADD] website: template reset confirmation
bzr revid: fme@openerp.com-20140401094233-9zcuc915l56a7h1h
2014-04-01 11:42:33 +02:00