Commit Graph
74366 Commits
Author SHA1 Message Date
Xavier Morel 0d64c9037d [IMP] Implement custom bootstrap dialog for links.
Dialog doesn't work right as it's a bootstrap 3-ish dialog, not 2, so
none of the classes works correctly.

Also moved editor templates outside of main website template file.

bzr revid: xmo@openerp.com-20130829153441-w51n3hxxikyti0xj
2013-08-29 17:34:41 +02:00
Christophe Matthieu e6da64b39e [IMP] website_crm_partner_assign: imp views
bzr revid: chm@openerp.com-20130829150058-bmcedth32o4nrdvh
2013-08-29 17:00:58 +02:00
Christophe Matthieu e92cb74565 [IMP] website_crm_partner_assign: some change in view
bzr revid: chm@openerp.com-20130829133210-o7tp2zj01x8i7fej
2013-08-29 15:32:10 +02:00
Christophe Matthieu 7d1f988681 [FIX] website_crm_partner_assign: search
bzr revid: chm@openerp.com-20130829130529-t4ngwalol808nmm3
2013-08-29 15:05:29 +02:00
Christophe Matthieu 9d93cd3958 [IMP] website_crm_partner_assign: create module: list of partner with a grade
bzr revid: chm@openerp.com-20130829130040-s4kyjakzwrmc9pt9
2013-08-29 15:00:40 +02:00
Christophe Matthieu 52b14d5ee0 [IMP] rename website_crm_partner_assign to website_worldmap
bzr revid: chm@openerp.com-20130829122113-uzau2huz0sb067f8
2013-08-29 14:21:13 +02:00
Christophe Matthieu b71464ad7b [IMP] website_contract: add location after worldmap
bzr revid: chm@openerp.com-20130829111058-6z8tqf70xyl3zmyy
2013-08-29 13:10:58 +02:00
Xavier Morel 796dcee2c3 [IMP] split out website.js
bzr revid: xmo@openerp.com-20130829102956-prfe9t5308m6y0vn
2013-08-29 12:29:56 +02:00
Xavier Morel 15843308f3 [FIX] missing dependency: res.users.share use added to website but share not a dependency of website
bzr revid: xmo@openerp.com-20130829101736-ubi7ih14viqto3xn
2013-08-29 12:17:36 +02:00
Christophe Matthieu 2f1f3ca665 [FIX] website_crm_partner_assign: worldmap icon
bzr revid: chm@openerp.com-20130829101725-rxx5p8orzu0sg29f
2013-08-29 12:17:25 +02:00
Xavier Morel 243ac25379 [IMP] avoid selectors when they are unnecessary
bzr revid: xmo@openerp.com-20130829093633-tjxrcbms076ihdv0
2013-08-29 11:36:33 +02:00
Christophe Matthieu ed35895126 [MERGE] from trunk
bzr revid: chm@openerp.com-20130828163937-japdo58t20hhqfoz
2013-08-28 18:39:37 +02:00
Christophe Matthieu 2fab26a2d2 [IMP] point_of_sale, product: change model 'pos.category' of the pos into product.public.category in product. product.public.category is used for eg by pos and website_sale. Add some demo data for this category. Add a domain in pos 'model.js' to select non empty categories
bzr revid: chm@openerp.com-20130828151658-3isgyl93c3hwp1pc
2013-08-28 17:16:58 +02:00
ddm 189dabab53 Mergefix
bzr revid: ddm@openerp.com-20130828140326-82z41q5yn08olrlv
2013-08-28 16:03:26 +02:00
ddm 3c9f07d244 SEO: keyword suggest mockup
bzr revid: ddm@openerp.com-20130828135558-w4ysgixr6l7n45b5
2013-08-28 15:55:58 +02:00
Xavier Morel d5ec571b8d [FIX] using the correct event turns out to work better than using the wrong one
The event for an editor being ready is instanceReady not loaded, turns
out there's no need for big comments whining about things not working
when using the right one.

bzr revid: xmo@openerp.com-20130828113905-sp2nby6hbnae8jfp
2013-08-28 13:39:05 +02:00
Fabien Pinckaers 82bbba14de [IMP] demo data
bzr revid: fp@tinyerp.com-20130828102114-w44ufdk3nujpmx3u
2013-08-28 12:21:14 +02:00
Christophe Matthieu 82c3c6bc33 [IMP] website_event: inherit website_sale mycart to don't display reduction if it's an event ticket price
bzr revid: chm@openerp.com-20130828094118-bzqgyuxc1ztqun8n
2013-08-28 11:41:18 +02:00
Christophe Matthieu ab08db3b87 [FIX] website_event: add to cart to website_sale
bzr revid: chm@openerp.com-20130828093416-o00apdeprqqgrx52
2013-08-28 11:34:16 +02:00
Xavier Morel 43c0bb84df [IMP] String#slice can take a negative second index
bzr revid: xmo@openerp.com-20130828092003-mjrao9vl9ju6bxa1
2013-08-28 11:20:03 +02:00
Xavier Morel 217fb8a53b [IMP] style & jquery usage & stuff
bzr revid: xmo@openerp.com-20130828091741-p1qdgqq8er47ouoq
2013-08-28 11:17:41 +02:00
Xavier Morel a7e58993cd [ADD] oe_dirty handling via mutation observers
shim necessary for browsers supporting old mutation events but not new mutation observers

bzr revid: xmo@openerp.com-20130828084945-yfqrs0v9v8iecwjm
2013-08-28 10:49:45 +02:00
Fabien Meghazi 35c8d2fe95 [ADD] website.route decorator
bzr revid: fme@openerp.com-20130827170707-xqc8f64dz9xoklo3
2013-08-27 19:07:07 +02:00
ddm 3871d540f8 SEO: enforce max 10 keywords
bzr revid: ddm@openerp.com-20130827151654-utzf6zz382m3oz3g
2013-08-27 17:16:54 +02:00
Fabien Pinckaers cc2d285b84 [IMP] Open the right page after installing an app
bzr revid: fp@tinyerp.com-20130827151303-3z6r15vikxza7x11
2013-08-27 17:13:03 +02:00
Fabien Meghazi 717e6ad280 [ADD] lang_info in rendering context
bzr revid: fme@openerp.com-20130827145116-jkgdvxmsrw7bpwe3
2013-08-27 16:51:16 +02:00
ddm eb039323d2 OOps
bzr revid: ddm@openerp.com-20130827141340-3ll60as5zpzp6l3v
2013-08-27 16:13:40 +02:00
ddm fcd97879e3 Improve SEO tools CSS across themes
bzr revid: ddm@openerp.com-20130827141235-wfrx21hqem1v076b
2013-08-27 16:12:35 +02:00
Fabien Meghazi f6fac87a45 [FIX] CKeditor customization
bzr revid: fme@openerp.com-20130827134259-pftz0iar2c5eqvge
2013-08-27 15:42:59 +02:00
Fabien Pinckaers 82a020554c [IMP] manifest website
bzr revid: fp@tinyerp.com-20130827132017-wigpowjzvbzvsr2d
2013-08-27 15:20:17 +02:00
Fabien Pinckaers e8d2a2dd85 [IMP] modules summary
bzr revid: fp@tinyerp.com-20130827131745-qgsx8yw5zrwo2yiv
2013-08-27 15:17:45 +02:00
Fabien Pinckaers 59819fac14 [IMP] cleaned CKEditor, minimal CSS change
bzr revid: fp@tinyerp.com-20130827130456-c3u40tesfalapj7z
2013-08-27 15:04:56 +02:00
ddm be165dbb7a SEO tools visual cleanup
bzr revid: ddm@openerp.com-20130827113550-xi8r0qs8oz2uu990
2013-08-27 13:35:50 +02:00
Christophe Matthieu 26fb3758e7 [IMP] website_crm_partner_assign: new module for display worldmap for list of partner. Call the template in an iframe (with get options: partner_id, width, height, partner_url).
bzr revid: chm@openerp.com-20130827102353-htupokzt9nmaiyeu
2013-08-27 12:23:53 +02:00
Fabien Pinckaers 155bfe2d42 [IMP] Published by Default
bzr revid: fp@tinyerp.com-20130827100316-9obekfc3ze70x6jh
2013-08-27 12:03:16 +02:00
Fabien Pinckaers dde7c432ad [IMP] success alert
bzr revid: fp@tinyerp.com-20130827100020-ca8bqdtl272nlhno
2013-08-27 12:00:20 +02:00
Fabien Pinckaers 8f64dd7f65 [IMP] Themes as a separate page, need to load all bootswatch themes when moving to BS3
bzr revid: fp@tinyerp.com-20130827095658-22jfyowv3bq3wfa1
2013-08-27 11:56:58 +02:00
ddm 5ddbdeac96 SEO keywords list mockup
bzr revid: ddm@openerp.com-20130827093237-v13oihsyhadl92w3
2013-08-27 11:32:37 +02:00
ddm 48a8aa14a3 SEO keywords must be unique
bzr revid: ddm@openerp.com-20130827085121-2vkxscag56dze107
2013-08-27 10:51:21 +02:00
ddm 85e54aba60 Add SEO keyword with [ENTER]
bzr revid: ddm@openerp.com-20130827083721-k49j8z0t081ig2p0
2013-08-27 10:37:21 +02:00
ddm 5f7d4098a0 Code cleanup
bzr revid: ddm@openerp.com-20130827082232-4irtyjd4t67pz5hl
2013-08-27 10:22:32 +02:00
ddm 08be8ad7b8 Prevent scrolling on SEO modal
bzr revid: ddm@openerp.com-20130827075552-udkn3d5xqpe62zka
2013-08-27 09:55:52 +02:00
ddm f880ce9ae7 Code cleanup
bzr revid: ddm@openerp.com-20130827074816-1kuvpbz6vubhel68
2013-08-27 09:48:16 +02:00
ddm 5787f089d3 SEO mockup fixes
bzr revid: ddm@openerp.com-20130827072124-41iuhuwr0dsdfbm6
2013-08-27 09:21:24 +02:00
ddm bda0a4fa36 SEO configurator mockup
bzr revid: ddm@openerp.com-20130827070435-bqrhg887ynz1f6ys
2013-08-27 09:04:35 +02:00
niv-openerp 00d3d9a4b6 [FIX] im: multiple bugs
bzr revid: nicolas.vanhoren@openerp.com-20130826135135-93tmyi6a1fpju8vy
2013-08-26 15:51:35 +02:00
niv-openerp 05a1a5ffe6 merge trunk
bzr revid: nicolas.vanhoren@openerp.com-20130826131051-c7aatnvew9q52iw6
2013-08-26 15:10:51 +02:00
niv-openerp 5e8315730b Solved a few bugs
bzr revid: nicolas.vanhoren@openerp.com-20130826125254-smlkkh5m3n36cklw
2013-08-26 14:52:54 +02:00
niv-openerp 8ee25f9856 Refactored to avoid user duplication problem
bzr revid: nicolas.vanhoren@openerp.com-20130826123947-alcsov647beqge0c
2013-08-26 14:39:47 +02:00
Christophe Matthieu 667d96ff0c [FIX] website: catch and dispatch error for rendering
bzr revid: chm@openerp.com-20130826101615-t1ouij4flhtdthxe
2013-08-26 12:16:15 +02:00