Commit Graph
73559 Commits
Author SHA1 Message Date
bth-openerp e5665f8868 [MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: bth@tinyerp.com-20130827055533-ybsdhedhetgclv6a
2013-08-27 11:25:33 +05:30
bth-openerp cf2dab4851 [IMP]IMproved code or class and navigation.
bzr revid: bth@tinyerp.com-20130826134729-b0olyv7di2oq5xrk
2013-08-26 19:17:29 +05:30
bth-openerp c45b813743 [IMP]Migrated website_sale into bootstrap 3.0.
bzr revid: bth@tinyerp.com-20130826133824-kj4ed1etmddcx9mo
2013-08-26 19:08:24 +05:30
Paramjit Singh Sahota 3a0d36b4d4 [IMP] Imprved for Search box.
bzr revid: psa@tinyerp.com-20130826133129-6l5576r39qcjj73i
2013-08-26 19:01:29 +05:30
Paramjit Singh Sahota 41a0186daa [IMP]Improved the billing form
bzr revid: psa@tinyerp.com-20130826121509-fds3sx1sw8p1eedg
2013-08-26 17:45:09 +05:30
Paramjit Singh Sahota ee41159e86 [REVERT] Reverted the changes of index.html file of website_sale
bzr revid: psa@tinyerp.com-20130826115133-f9n26296a9wilfdv
2013-08-26 17:21:33 +05:30
Paramjit Singh Sahota 199e945460 [IMP]Little Improved
bzr revid: psa@tinyerp.com-20130826111437-640etfb9ypsipeyx
2013-08-26 16:44:37 +05:30
Paramjit Singh Sahota 07d067a544 [IMP]Improved
bzr revid: psa@tinyerp.com-20130826110531-mnqj1q62l6epxvws
2013-08-26 16:35:31 +05:30
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
Frédéric van der Essen 04f97cf6e3 [IMP] website: missing commits for the snippet editor
bzr revid: fva@openerp.com-20130826100126-j26u21dchvwjijnh
2013-08-26 12:01:26 +02:00
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
Frédéric van der Essen 7e8ad30842 [MERGE] from upstream
bzr revid: fva@openerp.com-20130826092905-jvrvnnskmwhv61le
2013-08-26 11:29:05 +02:00
Paramjit Singh Sahota 011e195f3f Improved code.
bzr revid: psa@tinyerp.com-20130826092641-mbirfw9t322wn9am
2013-08-26 14:56:41 +05:30
Frédéric van der Essen 6c220f78bb [MERGE] website: mutation snippets
bzr revid: fva@openerp.com-20130826091819-z5nbw0jww7w7ydbl
2013-08-26 11:18:19 +02:00
Frédéric van der Essen e3a472170c [MERGE] from upstream
bzr revid: fva@openerp.com-20130826091703-qmipfeith2arjyr8
2013-08-26 11:17:03 +02:00
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
Frédéric van der Essen 306138327f [IMP] website: snippet resizing
bzr revid: fva@openerp.com-20130823160411-xoxek62wwhi5w3by
2013-08-23 18:04:11 +02:00
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
Frédéric van der Essen 8b23e73241 [FIX] website: fix regression in carousel insertion:w
bzr revid: fva@openerp.com-20130823100221-bm3jd0lzrv8929g7
2013-08-23 12:02:21 +02:00
Frédéric van der Essen b4ca228747 [IMP] website: clean up client side templates
bzr revid: fva@openerp.com-20130823100022-a2f0n4oc7f16glfd
2013-08-23 12:00:22 +02:00
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
Frédéric van der Essen d59a47f79c [IMP] website: merge snippet insert and mutation drag & drop code
bzr revid: fva@openerp.com-20130823091647-uoatz0k1458idhf3
2013-08-23 11:16:47 +02:00
Frédéric van der Essen 3ad504ffc4 [IMP] website: cleanup drop zones css and sort out z-index issues
bzr revid: fva@openerp.com-20130823090757-ffqvcselr1merggk
2013-08-23 11:07:57 +02:00
Frédéric van der Essen 84c0d68140 [MERGE] website: mutation snippets
bzr revid: fva@openerp.com-20130823083843-bky4qugrnb8jnidm
2013-08-23 10:38:43 +02:00