pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,597 Commits 1 Branch 0 Tags
9fe226b6ce9fdff313dde49011ea2c4325dedbbe
Commit Graph
470 Commits
Author SHA1 Message Date
ajay javiya (OpenERP) 2577be53ac [MERGE]: with main 
bzr revid: aja@tinyerp.com-20140123050930-nxq5nnc3y6q0i2lv
 2014-01-23 10:39:30 +05:30
Fabien Meghazi 92f06e7eab [MERGE] server side login 
bzr revid: fme@openerp.com-20140122133757-hougjgwesg9n9s1p
 2014-01-22 14:37:57 +01:00
Fabien Meghazi df63fcba81 [MERGE] upstream 
bzr revid: fme@openerp.com-20140122102232-77lvvwpzet58sa7p
 2014-01-22 11:22:32 +01:00
Christophe Matthieu 0e2b946ff3 [IMP] website snippet: convert column widget into visible snippet (in content category) 
bzr revid: chm@openerp.com-20140122094149-pdnc86o0q0v9aywo
 2014-01-22 10:41:49 +01:00
Fabien Meghazi 060cbedfb0 [IMP] Sign in shall not redirect to website 
bzr revid: fme@openerp.com-20140122085948-18tzsgz2p7f2zqpl
 2014-01-22 09:59:48 +01:00
Fabien Pinckaers 9d39a2c1b7 [IMP] better formatting of address 
bzr revid: fp@openerp.com-20140121190242-dfs8difj7tey9fts
 2014-01-21 20:02:42 +01:00
ddm@openerp.com d5afe7e5b9 [FIX] move Google Analytics key to correct group 
bzr revid: ddm@openerp.com-20140121165942-yen9xlfgme5u00o6
 2014-01-21 17:59:42 +01:00
ddm@openerp.com 1c3a7a8fd3 [IMP] Add support for Google Analytics 
bzr revid: ddm@openerp.com-20140121163456-i3v3a7oh8qejc9oo
 2014-01-21 17:34:56 +01:00
Christophe Matthieu 87d6f608da [IMP] website: In the top menu, we should see the active page 
bzr revid: chm@openerp.com-20140121154348-1y6uqc6t2oveae7i
 2014-01-21 16:43:48 +01:00
Christophe Matthieu b38d4d8a81 [FIX] website_blog: tour 
bzr revid: chm@openerp.com-20140121152307-kx92ee0za0w0pprr
 2014-01-21 16:23:07 +01:00
Christophe Matthieu 4ff1af4d01 [FIX] website: display or not editor edit button; website_sale: test tour; website: contact qweb widget 
bzr revid: chm@openerp.com-20140121123912-0ya4ziusj09efti3
 2014-01-21 13:39:12 +01:00
Fabien Meghazi c1f0fb5ed1 [MERGE] upstream 
bzr revid: fme@openerp.com-20140120161145-ntxx6y01vekk3tg2
 2014-01-20 17:11:45 +01:00
Christophe Matthieu 53d8280f1d [IMP] website: test class with test for website_sale sale process 
bzr revid: chm@openerp.com-20140120182643-tw65rig4qqi3sqqf
 2014-01-20 19:26:43 +01:00
Pooja Zankhariya (OpenERP) 1c127ac6b9 [MERGE]Merge with Parent 
bzr revid: pza@tinyerp.com-20140120122859-ody7gvh40e3ey0q2
 2014-01-20 17:28:59 +05:00
Christophe Matthieu 9730663537 [IMP] website snippet: add background option on quote slider 
bzr revid: chm@openerp.com-20140120101310-zam2fqzhfegu8rys
 2014-01-20 11:13:10 +01:00
ajay javiya (OpenERP) 5cd399721d [MERGE]: with main 
bzr revid: aja@tinyerp.com-20140120051407-qor80rgyq7ll4xwp
 2014-01-20 10:44:07 +05:30
Fabien Pinckaers 57505a1b24 [IMP] better about us page 
bzr revid: fp@tinyerp.com-20140119203319-ctai57l7kd4v2qxq
 2014-01-19 21:33:19 +01:00
Fabien Pinckaers 986546ae16 [IMP] improved footer CSS, 8 pixels more 
bzr revid: fp@tinyerp.com-20140119200952-6cfsm3wwwv8b6x3x
 2014-01-19 21:09:52 +01:00
Fabien Pinckaers a83f1282fa [IMP] CSS for logo, one pixel better 
bzr revid: fp@tinyerp.com-20140119193527-8e7oc1umebqkqxgx
 2014-01-19 20:35:27 +01:00
Fabien Pinckaers 40d490f507 [iMP] CSS langs 
bzr revid: fp@openerp.com-20140119182208-owtazt6q3hn3v7wm
 2014-01-19 19:22:08 +01:00
Fabien Pinckaers d554f09ca7 [IMP] Logo 
bzr revid: fp@openerp.com-20140119122959-etp99cwiuuagws30
 2014-01-19 13:29:59 +01:00
Fabien Pinckaers 270a25c7f5 [IMP] Allow logo in header 
bzr revid: fp@openerp.com-20140119120858-43rgeymrjmt42f11
 2014-01-19 13:08:58 +01:00
Fabien Pinckaers d7b81d7607 [IMP] Better Snippets 
bzr revid: fp@openerp.com-20140119095213-sd6n0us6mm2o7wt3
 2014-01-19 10:52:13 +01:00
Pooja Zankhariya (OpenERP) 722aee5336 [MERGE]Merge with Parent 
bzr revid: pza@tinyerp.com-20140117062056-yaw069hktnsk3iwj
 2014-01-17 11:20:56 +05:00
Fabien Pinckaers c253330993 [IMP] snippets cleaned feature grid 
bzr revid: fp@tinyerp.com-20140116190026-rtkluyf1kh0xisny
 2014-01-16 20:00:26 +01:00
Fabien Meghazi f41243acd3 [FIX] Login link from website 
bzr revid: fme@openerp.com-20140116182759-sq1aohhrufu1zh6f
 2014-01-16 19:27:59 +01:00
Fabien Meghazi 735c2b501b [IMP] integrate login into the website.layout 
bzr revid: fme@openerp.com-20140116181746-e2z9m4gym5kcdgmr
 2014-01-16 19:17:46 +01:00
Christophe Matthieu 4ff74cbf99 [IMP] website: editor menus is displayed in function of users groups (event, blog...) 
bzr revid: chm@openerp.com-20140116180535-c736cuxn12qghiea
 2014-01-16 19:05:35 +01:00
Fabien Pinckaers 78b4f8fe8f [IMP] Better feature list snippets 
bzr revid: fp@tinyerp.com-20140115183611-5see7x5616jdmw3o
 2014-01-15 19:36:11 +01:00
Christophe Matthieu b802e21671 [FIX] website snippet: jumbotron link to contact us 
bzr revid: chm@openerp.com-20140115142240-0fe7vr8dfnl092am
 2014-01-15 15:22:40 +01:00
Christophe Matthieu fd14481dd3 [IMP] website snippet: create snippets.sass, imrpove css and resizing layout 
bzr revid: chm@openerp.com-20140115125923-eggv51bsvokc7a06
 2014-01-15 13:59:23 +01:00
Pooja Zankhariya (OpenERP) ba458f6abc [MERGE]Merge with Parent 
bzr revid: pza@tinyerp.com-20140115123052-n9pfmaoh5jzev28d
 2014-01-15 17:30:52 +05:00
Thibault Delavallée 006ffd00ad [MERGE] Sync with website-al 
bzr revid: tde@openerp.com-20140115091759-fdupd1vral3z3ng8
 2014-01-15 10:17:59 +01:00
Fabien Pinckaers 097f9074b9 [IMP] more snippets 
bzr revid: fp@tinyerp.com-20140114231054-am7au91oxjv66ntn
 2014-01-15 00:10:54 +01:00
Fabien Pinckaers 2affab61ef [IMP] remove badge for login, better design 
bzr revid: fp@tinyerp.com-20140114223426-praiwqupdlh9cyy9
 2014-01-14 23:34:26 +01:00
Fabien Pinckaers 942497350e [IMP] Features snippets 
bzr revid: fp@tinyerp.com-20140114223158-0nlv75aavf0zrntp
 2014-01-14 23:31:58 +01:00
Fabien Pinckaers a14745d53e [IMP] Clean flat colors 
bzr revid: fp@tinyerp.com-20140114220548-c2bda6k3fn8weqqn
 2014-01-14 23:05:48 +01:00
Fabien Pinckaers d73c8f15b6 [IMP] cleaned CSS, removed CSS 
bzr revid: fp@tinyerp.com-20140114212533-iz4oleo0opads01l
 2014-01-14 22:25:33 +01:00
Thibault Delavallée b97727701c [IMP] [ADD] website: added base for template designer. 
[ADD] website: email_template: added website_link field, a link to edit the template
directly in the website
[ADD] website_mail: added controller and page to edit templates. They are still jinja
templates editable in the website. Not qweb templates.
[ADD] website_mail: JS file and editor override to enable only certain snippets. Those
are still to add, but will be base templates for email.
[IMP] website: improved the addition of editor JS in the template header to be able
to add JS file that override the editor without having to hack everything in the
template.

bzr revid: tde@openerp.com-20140113125534-djy48pi7lf42f9ms
 2014-01-13 13:55:34 +01:00
Christophe Matthieu 3d96b4c2a3 [IMP] website: snippets: add resize bar on snippet overlay; resising % 8px; remove size class 
bzr revid: chm@openerp.com-20140108122113-d2zcyaobkahixlpa
 2014-01-08 13:21:13 +01:00
Christophe Matthieu c4ea06327c [FIX] website: typo 
bzr revid: chm@openerp.com-20140106103855-vjd6ro0w4m0xkfrc
 2014-01-06 11:38:55 +01:00
Fabien Pinckaers fb06142319 [IMP] demo data and overall layout 
bzr revid: fp@tinyerp.com-20140102185858-z6uqc5l2h5aamud2
 2014-01-02 19:58:58 +01:00
Fabien Pinckaers 992830d773 [IMP] better snippets 
bzr revid: fp@tinyerp.com-20131224131201-f1wplq1g324g3y2q
 2013-12-24 14:12:01 +01:00
Fabien Pinckaers 147dc3b423 [IMP] wording 
bzr revid: fp@tinyerp.com-20131224130914-3mrrzpdirpimu3fa
 2013-12-24 14:09:14 +01:00
Fabien Pinckaers 571735c8d2 [IMP] wording 
bzr revid: fp@tinyerp.com-20131224130810-ej5fnh2yridfq894
 2013-12-24 14:08:10 +01:00
Fabien Pinckaers cd0913cb6a [IMP] css print 
bzr revid: fp@tinyerp.com-20131222232118-w4ig4wktyeg017d5
 2013-12-23 00:21:18 +01:00
Xavier Morel eb44a6b21e [FIX] in contactus page, replace res_company.partner_id by res_company.name so it can be saved 
bzr revid: xmo@openerp.com-20131218132610-adby5u0daviprjev
 2013-12-18 14:26:10 +01:00
Fabien Meghazi f57869a89d [FIX] menu should honor the 'Open in a new window' option 
bzr revid: fme@openerp.com-20131218130515-7ztpt4qpfb9bq5ah
 2013-12-18 14:05:15 +01:00
Fabien Meghazi fca5a85fc6 [FIX] forgot to remove a js statement 
bzr revid: fme@openerp.com-20131217134734-tfz8c3e6watamac3
 2013-12-17 14:47:34 +01:00
Fabien Meghazi 1434a5aae9 [IMP] allow to reset broken views in the 500 error page 
bzr revid: fme@openerp.com-20131217134600-v0i170n9gw7752vj
 2013-12-17 14:46:00 +01:00