Commit Graph
73538 Commits
Author SHA1 Message Date
Paramjit Singh Sahota e6b47051ea MERGED lp:~openerp-dev/openobject-addons/trunk-website-bootstrap-3.0-bth and resolved conflicts
bzr revid: psa@tinyerp.com-20130826093529-3o64l5r3osuxm6i4
2013-08-26 15:05:29 +05:30
Paramjit Singh Sahota 011e195f3f Improved code.
bzr revid: psa@tinyerp.com-20130826092641-mbirfw9t322wn9am
2013-08-26 14:56:41 +05:30
Paramjit Singh Sahota c4f58b7466 [IMP] improved css for checkout form and others.
bzr revid: psa@tinyerp.com-20130826074016-bejnsnij9ly9df93
2013-08-26 13:10:16 +05:30
bth-openerp af2306a29f [IMP]Migrated website_contract into bootstrap 3.0.
bzr revid: bth@tinyerp.com-20130826070854-uin768rdyrdn0uxc
2013-08-26 12:38:54 +05:30
Paramjit Singh Sahota 7e718a6804 [MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-bootstrap-3.0-bth
bzr revid: psa@tinyerp.com-20130826061942-dr9m4iv3jvtl77ib
2013-08-26 11:49:42 +05:30
Paramjit Singh Sahota ed6452c74f [IMP]Improved label-default.
bzr revid: psa@tinyerp.com-20130826061024-q5y4t2emq55rpr5f
2013-08-26 11:40:24 +05:30
bth-openerp a0dc6a502e [MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: bth@tinyerp.com-20130826060243-3yhxlioyv3bgkikd
2013-08-26 11:32:43 +05:30
bth-openerp 5352e96a4d [IMP]IMproved code for pager.
bzr revid: bth@tinyerp.com-20130826060057-0r61yfh36319y45a
2013-08-26 11:30:57 +05:30
Paramjit Singh Sahota 8f5068d8a1 [IMP] Improved code for 'website_sale' to make it compatible according to bootstrap 3.0
bzr revid: psa@tinyerp.com-20130826054441-g0xl17kvhcnbw3ck
2013-08-26 11:14:41 +05:30
Paramjit Singh Sahota af7d52ed07 [IMP] Improved code of 'website_contract' to make it compatible according to bootstrap 3.0
bzr revid: psa@tinyerp.com-20130826053030-66aoebw4zidrdqsc
2013-08-26 11:00:30 +05:30
Paramjit Singh Sahota 2e9463c664 [MERGe] Merged lp:~openerp-dev/openobject-addons/trunk-website-bootstrap-3.0-bth and removed conflicts.
bzr revid: psa@tinyerp.com-20130826045131-iuog4r9ijlilq3cv
2013-08-26 10:21:31 +05:30
Christophe Matthieu 5a90cb546d [FIX] website_sale: return to product after add to cart
bzr revid: chm@openerp.com-20130823144133-6qkx8flsra72crb4
2013-08-23 16:41:33 +02:00
Christophe Matthieu cf1780d251 [FIX] website_sale: set pricelist
bzr revid: chm@openerp.com-20130823143757-81cc0pzajetu55m8
2013-08-23 16:37:57 +02:00
bth-openerp 32b1bb5c1a [IMP]Add label class.
bzr revid: bth@tinyerp.com-20130823135742-fzekahsa02lofobg
2013-08-23 19:27:42 +05:30
bth-openerp 4ad19e07ed [IMP]Migrated website_event into bootstrap 3.0.
bzr revid: bth@tinyerp.com-20130823135250-t4mtewrmn3yyea9e
2013-08-23 19:22:50 +05:30
bth-openerp 6ae54e853d [IMP]Migrated website_crm into bootstrap 3.0.
bzr revid: bth@tinyerp.com-20130823134747-dsgox69g78yuj2ld
2013-08-23 19:17:47 +05:30
Paramjit Singh Sahota bc9afa1e72 [IMP] Improved code of 'website_contract' to make it compatible according to bootstrap 3.0
bzr revid: psa@tinyerp.com-20130823134441-024zi8tvgnuu7amu
2013-08-23 19:14:41 +05:30
bth-openerp 243bd13d2a [MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: bth@tinyerp.com-20130823133638-9mwes61mqvl546qz
2013-08-23 19:06:38 +05:30
Christophe Matthieu 3602641e1d [WIP] website_contract: reference view
bzr revid: chm@openerp.com-20130823133604-ujkiu67hrjtj4qtg
2013-08-23 15:36:04 +02:00
bth-openerp 91e85f18f2 [IMP]Migrated website_hr into bootstrap 3.0.
bzr revid: bth@tinyerp.com-20130823132829-399hwxt4gv4ad9j9
2013-08-23 18:58:29 +05:30
bth-openerp e2c9e2a26e [IMP]Added class name.
bzr revid: bth@tinyerp.com-20130823132138-tq40mj780juni8ky
2013-08-23 18:51:38 +05:30
bth-openerp 860f76a011 [IMP]IMproved bootstrap 3 in website_hr module.
bzr revid: bth@tinyerp.com-20130823131720-aueyal8plqv7ttky
2013-08-23 18:47:20 +05:30
Paramjit Singh Sahota 7f0956b47e [IMP] Improved code of 'website_crm' to make it compatible according to bootstrap 3.0
bzr revid: psa@tinyerp.com-20130823130108-j92k3izdr38nnyl0
2013-08-23 18:31:08 +05:30
bth-openerp a709b80c94 [FIX]Fixed if statement.
bzr revid: bth@tinyerp.com-20130823125144-zjhm5bnaw85bdtl0
2013-08-23 18:21:44 +05:30
bth-openerp 1532cfa673 [IMP]Improved bootstrap 3 in website_mail module.
bzr revid: bth@tinyerp.com-20130823123634-ax6zm64ywzvp22e0
2013-08-23 18:06:34 +05:30
ajay javiya (OpenERP) d3b90baa3f [IMP]: migrate website_event module from bootstrap 2.x to 3.0
bzr revid: aja@tinyerp.com-20130823121930-pryy1nq5nxels4u3
2013-08-23 17:49:30 +05:30
bth-openerp 94e2667e82 [IMP]Improved code for footer and icon.
bzr revid: bth@tinyerp.com-20130823121205-e3tsaj5pkyhyyq3i
2013-08-23 17:42:05 +05:30
ajay javiya (OpenERP) a76797b693 [IMP]: migrate website_mail module from bootstrap 2.x to 3.0
bzr revid: aja@tinyerp.com-20130823115211-6gcbq6h1upeeo50w
2013-08-23 17:22:11 +05:30
bth-openerp a142d3a16b [IMP]As per bootstrap 3.0 added class and tags.
bzr revid: bth@tinyerp.com-20130823105054-vgm8irxijayyfblg
2013-08-23 16:20:54 +05:30
Christophe Matthieu 651e511ed9 [IMP] website_sale: fix context value, get order line name insead of product name, wip payment
bzr revid: chm@openerp.com-20130823094017-90m72xi2oif4qkuj
2013-08-23 11:40:17 +02:00
ddm 4fc8193e46 CSS improvements
bzr revid: ddm@openerp.com-20130823092456-7g783rh2g0irlp63
2013-08-23 11:24:56 +02:00
bth-openerp d264a49b37 [IMP]Added js and css of bootstrap 3.0 in website module.
bzr revid: bth@tinyerp.com-20130823062541-nabdko619qkphdcz
2013-08-23 11:55:41 +05:30
ddm fe45f507a2 Fix variable name
bzr revid: ddm@openerp.com-20130822200407-450rptud8peg4fp7
2013-08-22 22:04:07 +02:00
Christophe Matthieu 370fa231bf [IMP] website_sale: add price for variation and price_list for reduction
bzr revid: chm@openerp.com-20130822142735-n1aglt9wakj27dsb
2013-08-22 16:27:35 +02:00
ddm 141dcf577b Clarify
bzr revid: ddm@openerp.com-20130822133621-237gzh6wxisxnn00
2013-08-22 15:36:21 +02:00
ddm f820c074a1 Disable editor on smartphones
<=767px according to bootstrap responsive classes

bzr revid: ddm@openerp.com-20130822124013-br8ccw8hb26dr060
2013-08-22 14:40:13 +02:00
ddm b9f2e796ca Mobile preview (initial styling)
bzr revid: ddm@openerp.com-20130822104736-5gt43278o83fvt9s
2013-08-22 12:47:36 +02:00
Fabien Meghazi 53fa372f6a [IMP] More precision for kanban column width
bzr revid: fme@openerp.com-20130822101952-qhliw0umneujz4cf
2013-08-22 12:19:52 +02:00
Christophe Matthieu 4b67f75722 [IMP] website: kanban: remove default layout with thumbnail class
bzr revid: chm@openerp.com-20130822093049-6kcj1eobj2sl2nn4
2013-08-22 11:30:49 +02:00
Christophe Matthieu 833951634e [FIX] website: kanban pager position
bzr revid: chm@openerp.com-20130822092536-lij12jeueg6bbo6v
2013-08-22 11:25:36 +02:00
Christophe Matthieu 8c23530b85 [FIX] website: kanban javascript
bzr revid: chm@openerp.com-20130822092416-sfcygyz15oi7qygr
2013-08-22 11:24:16 +02:00
Christophe Matthieu 0edba38c86 [IMP] website: kanban view; script in js file, dynamique template
bzr revid: chm@openerp.com-20130822091812-i71rjpxj1cprifbh
2013-08-22 11:18:12 +02:00
Christophe Matthieu 01733be984 [FIX] website_sale: pricelist code required
bzr revid: chm@openerp.com-20130822090941-yrb7c95xw2y4d15r
2013-08-22 11:09:41 +02:00
ddm 7d40a7db38 Mobile preview (initial commit)
bzr revid: ddm@openerp.com-20130822085825-7mpsoi0nyujekg5f
2013-08-22 10:58:25 +02:00
Frédéric van der Essen d26b487b71 [MERGE] website: further work on the snippet editor
bzr revid: fva@openerp.com-20130821163052-8t7nqni7okn555mc
2013-08-21 18:30:52 +02:00
Frédéric van der Essen 6ccd087ee0 [MERGE] from upstream
bzr revid: fva@openerp.com-20130821163002-y45g9l65xwrcxmsn
2013-08-21 18:30:02 +02:00
Frédéric van der Essen 5848dc526f [IMP] website: basics of snippet system are now working and looking good
bzr revid: fva@openerp.com-20130821162534-yr6nx292xoj2m2s2
2013-08-21 18:25:34 +02:00
Christophe Matthieu b806728af1 [IMP] website: create generic kanban view
bzr revid: chm@openerp.com-20130821160632-tsl5v1l5cj10w92c
2013-08-21 18:06:32 +02:00
Fabien Meghazi 98f19d8890 [IMP] Improved string interpolation in templates
bzr revid: fme@openerp.com-20130821145731-kkw9sxiv6oqz65qk
2013-08-21 16:57:31 +02:00
Xavier Morel 667dbbfdd9 [IMP] simplify ckeditor image and link dialogs
& add easy linking to existing site pages and attachments

bzr revid: xmo@openerp.com-20130821143816-0hvp0m0eklh6ti1m
2013-08-21 16:38:16 +02:00