Commit Graph
74877 Commits
Author SHA1 Message Date
Xavier Morel 7e6f1a104e [ADD] move view.save tests from server
bzr revid: xmo@openerp.com-20130910133055-75q72gd75sty317m
2013-09-10 15:30:55 +02:00
Christophe Matthieu 9693c18da2 [FIX] website.snippet: don't call snippet if the thumbnail is not dropped inside a drop zone
bzr revid: chm@openerp.com-20130910123101-ixosjev7tcx08g1z
2013-09-10 14:31:01 +02:00
Christophe Matthieu f61e65539e [IMP] website: auto open editor when create new product (use ?unable_editor in url)
bzr revid: chm@openerp.com-20130910122646-ug8dn61rqgbm3eq3
2013-09-10 14:26:46 +02:00
Christophe Matthieu cb8bdad1ec [FIX] website_sale: reduce qty
bzr revid: chm@openerp.com-20130910115159-qdmhi4rdmxqz5cm3
2013-09-10 13:51:59 +02:00
ddm 3ee7b343dc [FIX] Ace editor size
bzr revid: ddm@openerp.com-20130910112439-0d5aoddbxa29asf6
2013-09-10 13:24:39 +02:00
ddm 969d8fa32e [IMP] Improve XML display
bzr revid: ddm@openerp.com-20130910105113-2x0r1fls6hcln9m4
2013-09-10 12:51:13 +02:00
ddm a5e1ed7800 Merged trunk-website-al
bzr revid: ddm@openerp.com-20130910103353-j5sbly1v6m93qiel
2013-09-10 12:33:53 +02:00
Christophe Matthieu 45727ab601 [IMP] website snippet editor: add some comments
bzr revid: chm@openerp.com-20130910102140-sr5jxwme0uvvyjul
2013-09-10 12:21:40 +02:00
ddm c4f52f12cd [FIX] Proper editing undo
bzr revid: ddm@openerp.com-20130910101822-4pb6q6zq9dbho5h1
2013-09-10 12:18:22 +02:00
Christophe Matthieu 4bed245c08 [MERGE] from website-fva: snippets editor and building block
bzr revid: chm@openerp.com-20130910100348-w9kxnxc9tavyanqt
2013-09-10 12:03:48 +02:00
Christophe Matthieu 5a16088b0b [MERGE] from website-al
bzr revid: chm@openerp.com-20130910100159-xs0d8zngz4ybl0y9
2013-09-10 12:01:59 +02:00
ddm a109098cb7 [FIX] Proper editor sizing
bzr revid: ddm@openerp.com-20130910100127-98zjbitry2xhqld2
2013-09-10 12:01:27 +02:00
Xavier Morel 688cd146ef [FIX] disable removal of empty elements in ckeditor
we use empty elements for fontawesome icons, ckeditor removing them is
unexpected and bad nogood.

bzr revid: xmo@openerp.com-20130910090232-p6t5qaveo2q2nyth
2013-09-10 11:02:32 +02:00
Xavier Morel 8356560144 [IMP] move global CKEDITOR configuration to JS code
bzr revid: xmo@openerp.com-20130910085604-pye2vm3wo8qev11d
2013-09-10 10:56:04 +02:00
Xavier Morel 44e75d37b1 [FIX] markup cleanup: don't forget to remove oe_dirty flag class
bzr revid: xmo@openerp.com-20130910073112-nibl2n2qo3adkppe
2013-09-10 09:31:12 +02:00
ddm 9b1b1f3de0 [FIX] Slide in
bzr revid: ddm@openerp.com-20130910070718-0x541xioj1udwxnt
2013-09-10 09:07:18 +02:00
Xavier Morel 35a0a0b5ea [FIX] default plugins changes? Explicitly configure CKEDITOR plugins from now on
bzr revid: xmo@openerp.com-20130910065756-99kz2z4kddt4f7bo
2013-09-10 08:57:56 +02:00
ddm b230cc89af [FIX] Floating button
bzr revid: ddm@openerp.com-20130910065113-uqiltvbays6xpm34
2013-09-10 08:51:13 +02:00
ddm 6a245e471e [IMP] Basic animation
bzr revid: ddm@openerp.com-20130910064634-uz51lsczdxqw3fum
2013-09-10 08:46:34 +02:00
ddm d37594fab3 [FIX] View save now working
bzr revid: ddm@openerp.com-20130910063938-yh6tje9h5y9i0ld6
2013-09-10 08:39:38 +02:00
ddm 7c45e5976e CMS basic view editing
bzr revid: ddm@openerp.com-20130909214626-51zfydwbw624heqz
2013-09-09 23:46:26 +02:00
Christophe Matthieu 819eb62490 [WIP] website: snippets: work carousel insert and vomify
bzr revid: chm@openerp.com-20130909153251-9ixd50vy4ulyecgq
2013-09-09 17:32:51 +02:00
Xavier Morel ca40afd144 [FIX] necessary widget implementation
``inline`` is now automatically inferred on a per-widget basis if not
specified.

``inline`` true|false tells the widget whether it should work on
inlines (e.g. span) or blocks (e.g. p). Specifying the wrong one blows
up because the wrapper is incorrect (inline==false on an inline
element will wrap it in a div and add linefeeds, inline==true on a
block element will wrap it in a span which will automatically split up
in multiple elements leading to downcast blowing up because the wrong
wrapper will be selected).

Since last time, inline inference was added: if *unspecified* widget
will check what type of object it's called on (using
``CKEDITOR.dtd.$inline``) and generate the correct wrapper for that
type.

=> fix misbehavior by removing explicit inline spec.

Also remove unused init and data methods.

bzr revid: xmo@openerp.com-20130909152312-1m5kwvgw04gcrfkv
2013-09-09 17:23:12 +02:00
Christophe Matthieu 889309d4c9 [WIP] website: snippets: work
bzr revid: chm@openerp.com-20130909150319-x0vkucc9eci7vr18
2013-09-09 17:03:19 +02:00
Christophe Matthieu 7bcc4f4d1d [WIP] website: snippets: work
bzr revid: chm@openerp.com-20130909144940-f08v6egk5pijz29b
2013-09-09 16:49:40 +02:00
Christophe Matthieu 0b199c50e5 [WIP] website: snippets: box snippet widget with resize options on click
bzr revid: chm@openerp.com-20130909132800-au0lgkf8thirsv8r
2013-09-09 15:28:00 +02:00
Xavier Morel 2cbfb88437 [FIX] order parameter in view.save call
bzr revid: xmo@openerp.com-20130909111040-ijffmxt8i81h5ynq
2013-09-09 13:10:40 +02:00
Xavier Morel c29c3290c0 [FIX] use HTML parser for view sections coming back from JS
bzr revid: xmo@openerp.com-20130909111010-a0v9m7i02a2mo17v
2013-09-09 13:10:10 +02:00
Xavier Morel 55a84256a3 [FIX] make RTE activate again
bzr revid: xmo@openerp.com-20130909104238-6deglc3axbu8zsez
2013-09-09 12:42:38 +02:00
Fabien Meghazi bf09524def [FIX] context set on wrong methods
bzr revid: fme@openerp.com-20130909100059-j7yhkfql3qxaz96b
2013-09-09 12:00:59 +02:00
Xavier Morel 19c8912cb3 [FIX] updated save, save RPC call
bzr revid: xmo@openerp.com-20130909095112-yihzl1oyop9641uj
2013-09-09 11:51:12 +02:00
Xavier Morel f6762f79e6 [MERGE] from trunk likely completely broken
bzr revid: xmo@openerp.com-20130909094437-kyxvgoz7zxt3fes0
2013-09-09 11:44:37 +02:00
Fabien Meghazi e980e1c715 [FIX] context merge
bzr revid: fme@openerp.com-20130909075031-rvwxjdc07zhq0m8u
2013-09-09 09:50:31 +02:00
Fabien Pinckaers d97d58f5db [IMP] structure in snippets
bzr revid: fp@openerp.com-20130908210139-3wsl86ij3yd5udqz
2013-09-08 23:01:39 +02:00
Christophe Matthieu 62aafc07b1 [WIP] website: snippets, use template qweb js for snippets
bzr revid: chm@openerp.com-20130906160006-5gdgsv2jq8lz1voz
2013-09-06 18:00:06 +02:00
Christophe Matthieu 4d1cc6a4ed [WIP] website: snippets
bzr revid: chm@openerp.com-20130906150408-81qzb2492lwqf7lb
2013-09-06 17:04:08 +02:00
Xavier Morel 81118812a8 [ADD] moved view.save method from server
bzr revid: xmo@openerp.com-20130906130916-txj4mwhulb89kpov
2013-09-06 15:09:16 +02:00
Xavier Morel 76409db724 [FIX] bootstrap makes buttons unselectable, which breaks RTE. Revert behavior when button in section being edited
bzr revid: xmo@openerp.com-20130906101658-m35uqghtvi3kd7bc
2013-09-06 12:16:58 +02:00
Xavier Morel f4c27f6332 [FIX] move view's page attribute to module
bzr revid: xmo@openerp.com-20130906091351-37cr1g2scvpiyc7u
2013-09-06 11:13:51 +02:00
Xavier Morel e56953d94e [ADD] new table-creation button
bzr revid: xmo@openerp.com-20130906085045-zpemzy2akh3bz7q3
2013-09-06 10:50:45 +02:00
Christophe Matthieu 8a3f1742e0 [MERGE] from website-al
bzr revid: chm@openerp.com-20130906083500-4n5knaxiqt4cg2ht
2013-09-06 10:35:00 +02:00
Fabien Meghazi d2e90f0621 [BREAK] request.context everywhere
some stuff broken will be repaired by chm

bzr revid: fme@openerp.com-20130905151803-7d17us7rn9yubnb2
2013-09-05 17:18:03 +02:00
Christophe Matthieu c80cf7d064 [IMP] website_event: add subscribe option and comments
bzr revid: chm@openerp.com-20130905104212-m6cybnbif4tsn9t3
2013-09-05 12:42:12 +02:00
Christophe Matthieu 5943962ec1 [FIX] website_sale: display error with bootstrap 3
bzr revid: chm@openerp.com-20130905095933-1f6qabic7zeafn7a
2013-09-05 11:59:33 +02:00
Christophe Matthieu 7fee8f5609 [IMP] website: change footer xml
bzr revid: chm@openerp.com-20130905092927-2aixeyk1z5ot4oku
2013-09-05 11:29:27 +02:00
ddm 98a0b8c2f8 SEO move templates to website.seo.xml
bzr revid: ddm@openerp.com-20130905092038-a0ao4dxhjz902lqg
2013-09-05 11:20:38 +02:00
Christophe Matthieu c68f584988 [FIX] website: sass & css
bzr revid: chm@openerp.com-20130905082042-6n359n6ot5wntk0k
2013-09-05 10:20:42 +02:00
Christophe Matthieu a837eb1ba8 [FIX] website_sale: add product; update product number in cart
bzr revid: chm@openerp.com-20130905080407-4pwjvo1hxabf1a2r
2013-09-05 10:04:07 +02:00
Fabien Meghazi 6621c1275b [IMP] Refactoring using webcontext
bzr revid: fme@openerp.com-20130904153236-gc78bs8pxeprktkr
2013-09-04 17:32:36 +02:00
Xavier Morel 43ca2585c5 [FIX] don't try to be brokenly clever about preventing click on links during edition
bzr revid: xmo@openerp.com-20130904151021-otzw635in9lhh1e1
2013-09-04 17:10:21 +02:00