Commit Graph

2163 Commits

Author SHA1 Message Date
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
chm@openerp.com 8a3e35e3bb [MERGE] from trunk
bzr revid: chm@openerp.com-20140408154510-8snznjqkrdl3jwdg
2014-04-08 17:45:10 +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 f4225eda24 [FIX] website test tour
bzr revid: chm@openerp.com-20140408124119-jkmeh5vfdb3sjlna
2014-04-08 14:41:19 +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
chm@openerp.com be5fe933ec [MERGE] from trunk
bzr revid: chm@openerp.com-20140408080736-6b70rlfsvj3to0od
2014-04-08 10:07:36 +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
Kunal Chavda (Open ERP) e06a7036f1 [IMP]Implement effect on close tour like smartsheet.
bzr revid: kch@tinyerp.com-20140407084358-xnfsn6vsnnqy3lzf
2014-04-07 14:13:58 +05:30
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
ajay javiya (OpenERP) a9ee5d0a79 [MERGE] : with trunk
bzr revid: aja@tinyerp.com-20140401084327-daftkqduvknsa0rp
2014-04-01 14:13:27 +05:30
Quentin (OpenERP) 0a2a118ba3 [MERGE] website_gengo branch merged, offering the possiblity to translate the website using Gengo
bzr revid: qdp-launchpad@openerp.com-20140401073953-p46kottwmk9buhor
2014-04-01 09:39:53 +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
ajay javiya (OpenERP) 138f5d7f32 [MERGE] : with trunk and resolve conflicts
bzr revid: aja@tinyerp.com-20140401052801-4483i0z0ivmrwsbn
2014-04-01 10:58:01 +05:30
chm@openerp.com fd593a3049 [FIX] website_sale: test tour and activate website_event_sale test
bzr revid: chm@openerp.com-20140331151237-ec0j7ywfsbjsw83k
2014-03-31 17:12:37 +02:00
chm@openerp.com b6ba6d9a9c [FIX] website: create new page redirect to error 404
bzr revid: chm@openerp.com-20140331144123-p3unfkbqm5c0y1sx
2014-03-31 16:41:23 +02:00
chm@openerp.com 583a47b7b9 [IMP] website: media editor: add embed video
bzr revid: chm@openerp.com-20140331135558-ulr1nzhwwvcnwswm
2014-03-31 15:55:58 +02:00
chm@openerp.com e0d33ad3c5 [FIX] website editor: shop tour and media editor for field image
bzr revid: chm@openerp.com-20140331133340-vj67s9hlptum0h19
2014-03-31 15:33:40 +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
Fabien Pinckaers ed037b8a94 [REM] removed bootstrap sources
bzr revid: fp@tinyerp.com-20140331124809-t15wswgjj0c6if3y
2014-03-31 14:48:09 +02:00
Parth Gajjar (Open ERP) 8bde127659 merged with trunk-addons
bzr revid: pga@tinyerp.com-20140331122509-vkpy077tp216molq
2014-03-31 17:55:09 +05:30
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 655142b04b [IMP] website: media editor: add search result for images
bzr revid: chm@openerp.com-20140331120906-0qqa40xbvek27z4j
2014-03-31 14:09:06 +02:00
chm@openerp.com 1c4b7e9f6f [FIX] website: snippet slider slide button
bzr revid: chm@openerp.com-20140331115139-oa8va3ceikgc5b8w
2014-03-31 13:51:39 +02:00
chm@openerp.com 4281a3f89f [FIX] website: snippet typo of resize button
bzr revid: chm@openerp.com-20140331101043-0mf3c6pndz133huy
2014-03-31 12:10:43 +02:00
chm@openerp.com fa6cb6d6a2 [FIX] website media editor button position
bzr revid: chm@openerp.com-20140331100110-ue68pnnzaxusfu1u
2014-03-31 12:01:10 +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
Parth Gajjar (Open ERP) ff1588a46d [IMP] added new supportable languages, bog solved in config dialog, improved count words dialog
bzr revid: pga@tinyerp.com-20140331070625-qtr7l45lnca5rfze
2014-03-31 12:36:25 +05:30
ajay javiya (OpenERP) c4896f801c [MERGE] : with trunk
bzr revid: aja@tinyerp.com-20140331041956-0ots0gkn1d4ffudq
2014-03-31 09:49:56 +05:30
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
Fabien Pinckaers 62ff59ba9f [IMP] removing glyphicons from bootstrap less
bzr revid: fp@tinyerp.com-20140330131040-3athcual00brty26
2014-03-30 15:10:40 +02:00
Fabien Pinckaers 1c3835c83c [IMP] bootstrap less sources
bzr revid: fp@tinyerp.com-20140329202446-tz8b2rvenc6s3ds5
2014-03-29 21:24:46 +01:00
Fabien Pinckaers 2478af1b16 [IMP] better button snippet
bzr revid: fp@tinyerp.com-20140329192911-i75v53f0gos8fybm
2014-03-29 20:29:11 +01:00
Fabien Pinckaers f1131d547b [IMP] flat design, even for darken
bzr revid: fp@tinyerp.com-20140329125635-3ext2zt4y9n2cpua
2014-03-29 13:56:35 +01:00
chm@openerp.com 1a33fb64d5 [WIP] website: media editor
bzr revid: chm@openerp.com-20140328154715-alyj4kh33w6v8pgm
2014-03-28 16:47:15 +01:00
chm@openerp.com 31269ba52f [IMP] website: media editor doubleclick for video and begin to use snippet builder
bzr revid: chm@openerp.com-20140328141619-x9okgixai2v5dekr
2014-03-28 15:16:19 +01:00
Parth Gajjar (Open ERP) 3de6738dbb merged with trunk addons
bzr revid: pga@tinyerp.com-20140328131822-0kc0f5j5qhupkhbr
2014-03-28 18:48:22 +05:30
chm@openerp.com b0625b1191 [IMP] website: add video media editor
bzr revid: chm@openerp.com-20140328104453-2faynhhc1wi5598l
2014-03-28 11:44:53 +01:00
ajay javiya (OpenERP) e63646130e [MERGE] : with trunk
bzr revid: aja@tinyerp.com-20140328042815-kv5qmuh2wxdt9wwp
2014-03-28 09:58:15 +05:30
chm@openerp.com e289e23298 [WIP] website media editor
bzr revid: chm@openerp.com-20140327171417-nz2cd8tn2dmmljge
2014-03-27 18:14:17 +01:00
chm@openerp.com c8d0175e61 [IMP] website media editor: change template
bzr revid: chm@openerp.com-20140327160324-yb1cwpsgqymxsf83
2014-03-27 17:03:24 +01:00
Fabien Meghazi cf311bda60 [MERGE] remote module import
bzr revid: fme@openerp.com-20140327141233-i7xu8ism7howhflv
2014-03-27 15:12:33 +01:00
Parth Gajjar (Open ERP) 2de4260240 merged with trunk-addons
bzr revid: pga@tinyerp.com-20140327113805-2ie66rru6o10nv38
2014-03-27 17:08:05 +05:30
chm@openerp.com c15e5b5163 [WIP] website media editor
bzr revid: chm@openerp.com-20140327105103-r4laze34bf0z62o2
2014-03-27 11:51:03 +01:00
chm@openerp.com 94cf489dfc [MERGE] from trunk
bzr revid: chm@openerp.com-20140327095038-ycs4991u11o9oywv
2014-03-27 10:50:38 +01:00
chm@openerp.com 740e35e56d [MERGE] from trunk
bzr revid: chm@openerp.com-20140327094902-nko6rc1cs97b4sd1
2014-03-27 10:49:02 +01:00
chm@openerp.com c1b6589851 [IMP] website_event: widget to promote Events with country flag
bzr revid: chm@openerp.com-20140327093517-8ppcxypc6krxc2fi
2014-03-27 10:35:17 +01:00
Fabien Meghazi b7fbef1241 [FIX] Serve ir.attachment with SUPERUSER_ID
We are not supposed to have a user id here

bzr revid: fme@openerp.com-20140326184022-1hulv7t5y6vuvr9y
2014-03-26 19:40:22 +01:00
chm@openerp.com 9bb510938f [WIP] website: media editor for image
bzr revid: chm@openerp.com-20140326160701-6wf21suhkv4rimyw
2014-03-26 17:07:01 +01:00
chm@openerp.com a7dc05bf6e [WIP] website: add media editor template
bzr revid: chm@openerp.com-20140326155822-f4wascgyrm7ffeg8
2014-03-26 16:58:22 +01:00
Fabien Meghazi eb5cbea318 [MERGE] upstream
bzr revid: fme@openerp.com-20140326152433-vegu5tuvr8vc1s8v
2014-03-26 16:24:33 +01:00
chm@openerp.com 368bf4dff6 [FIX] website editor: color of style button
bzr revid: chm@openerp.com-20140326143655-33sm4i67zjn03o2c
2014-03-26 15:36:55 +01:00
chm@openerp.com aa63c56462 [IMP] website editor: add style button on image
bzr revid: chm@openerp.com-20140326141629-diz4rk0789no7yyl
2014-03-26 15:16:29 +01:00
chm@openerp.com b39be63a8b [IMP] website: fix and add rotationStep option for jsuery transfo
bzr revid: chm@openerp.com-20140326124339-ll12dxd2qyo3gpi3
2014-03-26 13:43:39 +01:00
Parth Gajjar (Open ERP) 473243270b [MERGE] merged with trunk addons
bzr revid: pga@tinyerp.com-20140326112709-m1iqkkmjt1xtmio1
2014-03-26 16:57:09 +05:30
chm@openerp.com 99ac3ff81b [MERGE] from trunk
bzr revid: chm@openerp.com-20140326105539-9hf1x7u6lvh2hq2f
2014-03-26 11:55:39 +01:00
chm@openerp.com 26692117b6 [ADD] website: add jQuery.transfo.js to transform dom (rotation, scale, translate)
bzr revid: chm@openerp.com-20140326105345-rq58x39zl6wi6a7s
2014-03-26 11:53:45 +01:00
Richard Mathot (OpenERP) dbd36f318c [FIX] Rem old merged code (SHOULD NOT BE MERGED INTO TRUNK)
bzr revid: rim@openerp.com-20140326084646-0vutq1anyeju3w2y
2014-03-26 09:46:46 +01:00
ajay javiya (OpenERP) 864892d6ce [MERGE] : with trunk
bzr revid: aja@tinyerp.com-20140326054841-9yoaub8fw058vjkm
2014-03-26 11:18:41 +05:30
Fabien Meghazi 0fe55dddc1 [IMP] Added a mimetype field in ir.attachment
bzr revid: fme@openerp.com-20140325160413-jvxjii6rbqcrjxor
2014-03-25 17:04:13 +01:00
Richard Mathot (OpenERP) 6e25b1fc3f [MERGE] Sync with trunk
bzr revid: rim@openerp.com-20140325152935-hifgmzdl63yhmkll
2014-03-25 16:29:35 +01:00
chm@openerp.com 0d4d9af5f4 [FIX] website: fix and activate frontend test
bzr revid: chm@openerp.com-20140325140328-3f5is66d0petqrl6
2014-03-25 15:03:28 +01:00
Fabien Meghazi 329c19f94e [FIX] Fix url slug check bug in multilang=True
bzr revid: fme@openerp.com-20140325140026-0qdx9zl21za8gto9
2014-03-25 15:00:26 +01:00
ajay javiya (OpenERP) f76a734e90 [MERGE] : with trunk
bzr revid: aja@tinyerp.com-20140325114109-lts5z42lq9xlgqx0
2014-03-25 17:11:09 +05:30
Fabien Meghazi 8435da41bc [MERGE] upstream
bzr revid: fme@openerp.com-20140325103928-ja3bqy6xmyp91gva
2014-03-25 11:39:28 +01:00
Fabien Meghazi 27f38edb25 [FIX] dirty saas-3 fix for url lang switching with model converters
bzr revid: fme@openerp.com-20140325100722-temaci88fowcr2m5
2014-03-25 11:07:22 +01:00
Richard Mathot (OpenERP) 631532072d [MERGE] Sync with trunk
bzr revid: rim@openerp.com-20140325085451-rscgni01o54123fm
2014-03-25 09:54:51 +01:00
chm@openerp.com 13d7cfe86c [MERGE] from trunk
bzr revid: chm@openerp.com-20140324082341-d6gqyloc7822aen2
bzr revid: chm@openerp.com-20140325084852-i1yomuyhyen4ss95
2014-03-25 09:48:52 +01:00
Fabien Pinckaers fa46f255f2 [IMP] wording
bzr revid: fp@tinyerp.com-20140324203540-rx76yaqaw3p9aql9
2014-03-24 21:35:40 +01:00
Simon Lejeune 6889165eb1 [MERGE] trunk
bzr revid: sle@openerp.com-20140324164409-452kibtg3l7rd0nj
2014-03-24 17:44:09 +01:00
Simon Lejeune 9556cadbff [MERGE] trunk
bzr revid: sle@openerp.com-20140324162043-dzdwcxdt32sfjy57
2014-03-24 17:20:43 +01:00
Fabien Meghazi bb8b7ea2d9 [ADD] website ir_http: serve binary ir.attchments with urls
bzr revid: fme@openerp.com-20140324151728-hpegewvf3b38ndyi
2014-03-24 16:17:28 +01:00
Fabien Meghazi 9285813da9 [IMP] website images: only checksum ir.attachment for empty urls
bzr revid: fme@openerp.com-20140324151447-a3mkncjh0b7k16hg
2014-03-24 16:14:47 +01:00
chm@openerp.com e5f645df4d [FIX] website: snippet editor: forward port of branch saas-3
bzr revid: chm@openerp.com-20140324145416-qn2fvylylxtgu39a
2014-03-24 15:54:16 +01:00
Simon Lejeune 50fda546e2 [REF] Moved qweb contact from website to base and removed the from_html method (it never worked)
bzr revid: sle@openerp.com-20140324135933-f21heo0sz0tzjbv3
2014-03-24 14:59:33 +01:00
chm@openerp.com 5692dbdb5e [IMP] website: Building block / Snippet Editor
Add documentation and clean framework
The building blocks appear in the edit bar website. These prebuilt html block allowing the designer to easily generate content on a page (drag and drop).
Options allow snippets to add customizations party html code according to their selector (jQuery) and javascript object.

bzr revid: chm@openerp.com-20140324135220-j0abaam1n4ue03l7
2014-03-24 14:52:20 +01:00
chm@openerp.com 449ca3ab18 [IMP] website snippet: add example in documentation
bzr revid: chm@openerp.com-20140324135013-1fr3kznkw29wvca2
2014-03-24 14:50:13 +01:00
Christophe Simonis d93b79e6f4 [MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
2014-03-24 14:38:11 +01:00
chm@openerp.com ba55fcf1d0 [IMP] website: Building block / Snippet Editor
Add documentation and clean framework
The building blocks appear in the edit bar website. These prebuilt html block allowing the designer to easily generate content on a page (drag and drop).
Options allow snippets to add customizations party html code according to their selector (jQuery) and javascript object.

bzr revid: chm@openerp.com-20140324130119-xbnejtayna8haykk
2014-03-24 14:01:19 +01:00
Parth Gajjar (Open ERP) 69e6a7a808 [IMP] send source url in gengo comment, and save page on gengo post
bzr revid: pga@tinyerp.com-20140324111253-xts034vw3rjjl1cb
2014-03-24 16:42:53 +05:30
Parth Gajjar (Open ERP) bf0d35dbdd [IMP] merged gengo translator with main translator, removed 'Restart Job' from wizard,removed constraint from base_gengo
bzr revid: pga@tinyerp.com-20140324103631-j4cswrlk5huuibt5
2014-03-24 16:06:31 +05:30
Xavier Morel aa9387e845 [FIX] don't mark view sections as dirty just because the snippets thing has inserted drop zones in it
bzr revid: xmo@openerp.com-20140324101850-el3cfs0x4uln3u7v
2014-03-24 11:18:50 +01:00
chm@openerp.com 62814f9c23 [FIX] website: activate new tour tests
bzr revid: chm@openerp.com-20140324081112-15n58puu29weydme
2014-03-24 09:11:12 +01:00
Fabien Pinckaers 843ac33ad9 [IMP] clean css
bzr revid: fp@tinyerp.com-20140322185641-qy57fotd1uvztffy
2014-03-22 19:56:41 +01:00
Fabien Pinckaers d03a8e8fcd [IMP] removed history wizard, avatar handling
bzr revid: fp@tinyerp.com-20140322175329-s0uum9gircwryg09
2014-03-22 18:53:29 +01:00
chm@openerp.com 24d37e2844 [FIX] website tour: template loading hide the real error
bzr revid: chm@openerp.com-20140321134546-i5nw73en8thzrwc2
2014-03-21 14:45:46 +01:00
chm@openerp.com f9b0c7469a [IMP] website tour: change syntax
bzr revid: chm@openerp.com-20140321134207-y54uj2fynl5p0e8a
2014-03-21 14:42:07 +01:00
chm@openerp.com 89a6bd0649 [IMP] website tour: fix auto test
bzr revid: chm@openerp.com-20140321123722-dmfdckh59cvot00i
2014-03-21 13:37:22 +01:00
Simon Lejeune 6b5986e34d [FIX] ir_http website postprocess args: do not redirect if the only difference between the url and the post-processed url is the url-enconding of some characters
bzr revid: sle@openerp.com-20140321120133-0k1zjsrtgwrw6oon
2014-03-21 13:01:33 +01:00
chm@openerp.com d8f27686e5 [IMP] website tour: fix test tour
bzr revid: chm@openerp.com-20140321115724-iwu17fkzdzaksmrs
2014-03-21 12:57:24 +01:00
chm@openerp.com 429324999c [IMP] website tour: remove tag script and css to lib bootstrap
bzr revid: chm@openerp.com-20140321112344-mwh2p8pp02j9sdq0
2014-03-21 12:23:44 +01:00
chm@openerp.com 254b3a29fa [IMP] website tour: auto set backdrop if no selector element
bzr revid: chm@openerp.com-20140321111815-t0312xxl7l83w9rx
2014-03-21 12:18:15 +01:00
chm@openerp.com 58b6aeb01d [IMP] website tour: remove bootstrap Tour lib
bzr revid: chm@openerp.com-20140321110750-ew8rj3nv2jcort1x
2014-03-21 12:07:50 +01:00
Xavier Morel a56dc53bea [REM] 4-spaces indent for web view pretty-print-before-save routine
Didn't quite work right: on the layout, it would exponentially increase
leading spaces in text nodes. Combined with a bug injecting snippets marks in
the footer (and thus invalidating and re-saving the layout at each snippet
addition) this could blow up the layout template and rendered page to >20MB.

Just keep lxml's standard 2-spaces indent.

LXML is unable to pretty print the layout anyway.

bzr revid: xmo@openerp.com-20140321075419-9w88h232r928xv5f
2014-03-21 08:54:19 +01:00
Denis Ledoux 30853afd18 [FIX] website: prevent animations in edit mode
bzr revid: dle@openerp.com-20140321150800-q8p8hn8a7aozcya4
2014-03-21 16:08:00 +01:00
chm@openerp.com abfccd8936 [WIP] website tour: bootstrap-tour - v0.9.1
bzr revid: chm@openerp.com-20140320151542-blfr1rs1j24xanh8
2014-03-20 16:15:42 +01:00
Parth Gajjar (Open ERP) ac8babe0e5 [IMP] minor changes
bzr revid: pga@tinyerp.com-20140320120758-ojgqpqb8sakdhkbb
2014-03-20 17:37:58 +05:30
Parth Gajjar (Open ERP) e45d9bc7b0 [IMP] removed unnecessary code
bzr revid: pga@tinyerp.com-20140320094434-4zp7x6dmd27wfza2
2014-03-20 15:14:34 +05:30
Parth Gajjar (Open ERP) a378f547f4 [IMP] minor changes
bzr revid: pga@tinyerp.com-20140320092643-1pw62dmbj9h6sjh4
2014-03-20 14:56:43 +05:30
chm@openerp.com 0b75d4ea04 [IMP] website: remove bootstrap_tour_stub
bzr revid: chm@openerp.com-20140320085606-qrghlkev6i9pu9bw
2014-03-20 09:56:06 +01:00
chm@openerp.com 60bdd78706 [IMP] website tour: refactoring and change api for create tour and test
bzr revid: chm@openerp.com-20140320083055-z5ys4oey5brd439v
2014-03-20 09:30:55 +01:00
Parth Gajjar (Open ERP) b7a68828ed [IMP] improved statistics, added sendbox options for testing, improved UI
bzr revid: pga@tinyerp.com-20140320071028-adyh8d89o7dij81o
2014-03-20 12:40:28 +05:30
Parth Gajjar (Open ERP) b8d87606f0 [IMP] added gengo statistics, displayed inprogress elements
bzr revid: pga@tinyerp.com-20140319133121-31umju0ea84sm93y
2014-03-19 19:01:21 +05:30
chm@openerp.com 00aa1b69dc [FIX] website tour: don't hide error in test mode if openerp don't exist
bzr revid: chm@openerp.com-20140319102348-rb1tkgd14nca6o15
2014-03-19 11:23:48 +01:00
chm@openerp.com b80d06d327 [FIX] website tour: reset tour before console.log 'ok' or 'error' who close phantomjs tour
bzr revid: chm@openerp.com-20140319092012-v83w99ts6z0apgl0
2014-03-19 10:20:12 +01:00
Dharmraj Jhala (OpenERP) e07861bb19 [MERGE] with latest trunk addons
bzr revid: dizzy.zala@gmail.com-20140319090139-1eaj26atlah94n7y
2014-03-19 14:31:39 +05:30
chm@openerp.com a762af1f21 [FIX] website_sale: payment get status url (ending slash); fix debbuger template url scripts
bzr revid: chm@openerp.com-20140319085700-b4v9iu51a9jtzty3
2014-03-19 09:57:00 +01:00
Richard Mathot (OpenERP) ecc7c1fbd3 [MERGE] Sync with trunk
bzr revid: rim@openerp.com-20140319072330-lvlrxsqq667hfu28
2014-03-19 08:23:30 +01:00
chm@openerp.com ed2743f755 merge upstream
bzr revid: chm@openerp.com-20140318161114-4t331xpt4xeitgxo
2014-03-18 17:11:14 +01:00
Parth Gajjar (Open ERP) c49befd59f [ADD] added website_gengo module
bzr revid: pga@tinyerp.com-20140318133036-j1hcrz7bybolw44u
2014-03-18 19:00:36 +05:30
Christophe Simonis 99a3c45976 [MERGE] forward port of branch saas-3 up to revid 9328 chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
bzr revid: chs@openerp.com-20140318132741-aur3q1k7t9iympri
2014-03-18 14:27:41 +01:00
chm@openerp.com 1395c9ee0e [IMP] website: snippet editor: change size automatic button into a cross between resize handler
bzr revid: chm@openerp.com-20140318130414-yb29wtm7oo4bammz
2014-03-18 14:04:14 +01:00
chm@openerp.com f9579073fe [FIX] website: color of Edit Master link for themes. CSS less specific
bzr revid: chm@openerp.com-20140318111442-mbrhrmtnwy3uxc5y
2014-03-18 12:14:42 +01:00
chm@openerp.com abe8e7208e [MERGE] from trunk
bzr revid: chm@openerp.com-20140318102102-ug0ny6q360i4o1e6
2014-03-18 11:21:02 +01:00