pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,206 Commits 1 Branch 0 Tags
72700a2cf97243da609fffcbc6c9e8fa834701cc
Commit Graph
210 Commits
Author SHA1 Message Date
Richard Mathot (OpenERP) 6e25b1fc3f [MERGE] Sync with trunk 
bzr revid: rim@openerp.com-20140325152935-hifgmzdl63yhmkll
 2014-03-25 16:29:35 +01:00
Richard Mathot (OpenERP) 631532072d [MERGE] Sync with trunk 
bzr revid: rim@openerp.com-20140325085451-rscgni01o54123fm
 2014-03-25 09:54:51 +01:00
chm@openerp.com 13d7cfe86c [MERGE] from trunk 
bzr revid: chm@openerp.com-20140324082341-d6gqyloc7822aen2
bzr revid: chm@openerp.com-20140325084852-i1yomuyhyen4ss95
 2014-03-25 09:48:52 +01:00
Simon Lejeune 50fda546e2 [REF] Moved qweb contact from website to base and removed the from_html method (it never worked) 
bzr revid: sle@openerp.com-20140324135933-f21heo0sz0tzjbv3
 2014-03-24 14:59:33 +01:00
chm@openerp.com a762af1f21 [FIX] website_sale: payment get status url (ending slash); fix debbuger template url scripts 
bzr revid: chm@openerp.com-20140319085700-b4v9iu51a9jtzty3
 2014-03-19 09:57:00 +01:00
Richard Mathot (OpenERP) 04e2c89c62 [MERGE] Sync with trunk 
bzr revid: rim@openerp.com-20140315102709-3zp27g8lyr3z36d1
 2014-03-15 11:27:09 +01:00
chm@openerp.com 384f398090 [IMP] website: publish button use action for url to backend 
bzr revid: chm@openerp.com-20140311171941-1fwhholwlsuncjyh
 2014-03-11 18:19:41 +01:00
Christophe Simonis d504764eff [MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6 
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
 2014-03-11 15:52:05 +01:00
Kersten Jeremy 9f23642476 [FIX] Change 'Administration' to 'My Account' to switch between website and portal - backend and frontend 
bzr revid: jke@openerp.com-20140307131017-nhqlnhnsgeprtblc
 2014-03-07 14:10:17 +01:00
Richard Mathot (OpenERP) dbd02d734b [MERGE] Sync with trunk 
bzr revid: rim@openerp.com-20140303131137-2shoyv0ywvgp5fx3
 2014-03-03 14:11:37 +01:00
Christophe Matthieu c11f4f9352 [FIX] website: snippet: continue slide cycling when the user edit the content 
bzr revid: chm@openerp.com-20140228095531-8c735qyacmffryno
 2014-02-28 10:55:31 +01:00
Richard Mathot (OpenERP) ee51fc0ca6 [MERGE] Sync with trunk 
bzr revid: rim@openerp.com-20140225093040-6k4kmj93uo2bk6t9
 2014-02-25 10:30:40 +01:00
Simon Lejeune 65dc368cdd [MERGE] trunk 
bzr revid: sle@openerp.com-20140221145952-fh5i7k18egwo3l5t
 2014-02-21 15:59:52 +01:00
Christophe Simonis 7e2bf04b4a [FIX] website: bootstrap is now in web module 
bzr revid: chs@openerp.com-20140221104725-e1w0t9ety5oqjf0y
 2014-02-21 11:47:25 +01:00
Simon Lejeune 35b64811e9 [MERGE] trunk 
bzr revid: sle@openerp.com-20140221095425-9043pbzjy7rtbxd1
 2014-02-21 10:54:25 +01:00
Christophe Simonis 4b72678bc7 [MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr 
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
 2014-02-20 17:38:15 +01:00
Richard Mathot (OpenERP) 77e89f6a81 [MERGE] Sync with trunk 
bzr revid: rim@openerp.com-20140220120929-lbhrdz5sv190ylhu
 2014-02-20 13:09:29 +01:00
Paramjit Singh Sahota e776245b8b [ADD] Added jquery.placeholder lib. because IE9 is not supporting the placeholders. 
bzr revid: psa@tinyerp.com-20140220100716-01mjib3w692qdgi1
 2014-02-20 15:37:16 +05:30
Christophe Matthieu 09397684b3 [FIX] website: change odrer of script tag because jquery-ui-1.9.1.custom overwrite jQuery and cancel some bootstrap method in edit mode 
bzr revid: chm@openerp.com-20140218153451-uxd87o5b7zy3asvv
 2014-02-18 16:34:51 +01:00
Christophe Matthieu 00c810ab14 [FIX] website: Don't allow to edit the menu inline. Users try to change the link, but it does not work. We can put a tooltip explaning they should use the content top menu to edit the menu; bootstrap tooltip don't available in edit mode. 
bzr revid: chm@openerp.com-20140218145619-fboofhu111s3g45p
 2014-02-18 15:56:19 +01:00
Christophe Matthieu 8830cb581c [FIX] website: In the footer, users record their phone number inbetween the fa-phone and the t-field. As a result, they change the footer template, not the phone number of the company. This zone should be t-ignore to avoid this mistake. 
bzr revid: chm@openerp.com-20140218110250-lvvem8ibkg3g8e8d
 2014-02-18 12:02:50 +01:00
openerp-sle 2445e9f0bc [MERGE] trunk 
bzr revid: openerp-sle@openerp-sle.home-20140216103609-ihf3bz4nf4rds5ue
 2014-02-16 11:36:09 +01:00
openerp-sle 0ae6d1f4e7 [FIX] More accurate values for the demo paper format and website contact widget enhanced 
bzr revid: openerp-sle@openerp-sle.home-20140213120739-4jh30s94scfr584e
 2014-02-13 13:07:39 +01:00
openerp-sle eb4bdb1a49 [IMP] Website: contact widget has now an option to disable fontawesome markers 
bzr revid: openerp-sle@openerp-sle.home-20140212220801-66kuwbz8d3piy2sa
 2014-02-12 23:08:01 +01:00
Christophe Matthieu ed785f0783 [FIX] website_sale: pager and breadcrum keep search and filter. Filter keep search and category. Links for category 
bzr revid: chm@openerp.com-20140212115516-3izdv7cszgh2n3l4
 2014-02-12 12:55:16 +01:00
Christophe Matthieu ac03ba3095 [FIX] website: pager don't keep searches 
bzr revid: chm@openerp.com-20140212102805-5khiv3cgslci9che
 2014-02-12 11:28:05 +01:00
Christophe Matthieu 1b52723e97 [IMP] website: remove bootstrap in addons/website and use bootstrap from web 
bzr revid: chm@openerp.com-20140211110457-cmqdhbs6wugqt14x
 2014-02-11 12:04:57 +01:00
Christophe Matthieu 7d1ba3329c [FIX] website: contactus: address of the company above the phone, typo edit button 
bzr revid: chm@openerp.com-20140211095933-s712ssydrv1d54nq
 2014-02-11 10:59:33 +01:00
Richard Mathot (OpenERP) af58bb70bc [MERGE] Merge trunk 
bzr revid: rim@openerp.com-20140211072305-uzc1oocfn4jnuf8i
 2014-02-11 08:23:05 +01:00
Frédéric van der Essen 04a6074b1a [MERGE] forward porting fixes from saas-3 
bzr revid: fva@openerp.com-20140210155628-75mgw7qcq9k5ncem
 2014-02-10 16:56:28 +01:00
Xavier Morel d4c7de4b03 [FIX] work around distribute_branding 
distribute_branding is applied after view inheritance is applied, and does not
take it in account. As a result, altering an existing view "from the top"
(e.g. adding a div element preceding an existing div) will alter the xpath
leading to whatever element we need to deal with.

Move fakebar injection to the bottom of the body, where it can't have any
impact on preceding node paths.

bzr revid: xmo@openerp.com-20140210132855-lwh1ow1tq1e0pidp
 2014-02-10 14:28:55 +01:00
Richard Mathot (OpenERP) 7b606a662b [MERGE] Sync with trunk 
bzr revid: rim@openerp.com-20140210082325-orsule85beliwswl
 2014-02-10 09:23:25 +01:00
Antony Lesuisse 87172d90d2 [MERGE] saas-3 
bzr revid: al@openerp.com-20140209140315-ukqlf90ngy6ycu2k
 2014-02-09 15:03:15 +01:00
Richard Mathot (OpenERP) 1a7d7a3f55 [MERGE] Sync with trunk 
bzr revid: rim@openerp.com-20140207163324-0fj6qsqs79bvutx6
 2014-02-07 17:33:24 +01:00
Fabien Pinckaers 5f92743b18 [IMP] logo by default (easier to configure) 
bzr revid: fp@tinyerp.com-20140207134836-pjub0d84nxmgb560
 2014-02-07 14:48:36 +01:00
Christophe Matthieu b21bb08c22 [ADD] website: test login, backend, go back, branding, edit, logout 
bzr revid: chm@openerp.com-20140207125231-3zd0i1axdwuht5g4
 2014-02-07 13:52:31 +01:00
Christophe Matthieu e8964f896c [FIX] website: tour, test and test_runner 
bzr revid: chm@openerp.com-20140206140746-jmeyx8q9qxv7sz1j
 2014-02-06 15:07:46 +01:00
Christophe Matthieu d819d494f1 [IMP] website: add debugger template used to create nex tours/tests (display in customize menu in debug mode) 
bzr revid: chm@openerp.com-20140206135036-geq8fubtz39pxp20
 2014-02-06 14:50:36 +01:00
Xavier Morel 18d9e91394 [IMP] make editor bar appear faster to avoid impression of slowness and reflow 
bzr revid: xmo@openerp.com-20140204153616-swho76l8v3s4p1dq
 2014-02-04 16:36:16 +01:00
ddm@openerp.com 319185a1ed [FIX] Remove redundant microdata 
bzr revid: ddm@openerp.com-20140203131454-7h3t2x4ff1z085xi
 2014-02-03 14:14:54 +01:00
ddm@openerp.com 0733d51365 [IMP] Organization microdata 
bzr revid: ddm@openerp.com-20140203124718-8ogunilwsvm42ikt
 2014-02-03 13:47:18 +01:00
Richard Mathot (OpenERP) 7f0c30580b [MERGE] Sync with trunk-website-al 
bzr revid: rim@openerp.com-20140131154544-tfcci0uo0q6652jh
bzr revid: rim@openerp.com-20140202135602-82pcqeqqtdp6h9fr
 2014-02-02 14:56:02 +01:00
Fabien Meghazi 5451f5587d [REV] Bring back QWebExceptions 
bzr revid: fme@openerp.com-20140131113611-wee3xvnvzw9smq2r
 2014-01-31 12:36:11 +01:00
Richard Mathot (OpenERP) 7b70388235 [MERGE] Sync with trunk-website-al 
bzr revid: rim@openerp.com-20140131075821-qx8cc0ybtxqr7219
 2014-01-31 08:58:21 +01:00
Antony Lesuisse 974c666bcd [REV] website qweb dont change exception types 
bzr revid: al@openerp.com-20140131011427-3bome249kut8fs3t
 2014-01-31 02:14:27 +01:00
Fabien Meghazi 1931c307a2 [IMP] Improved qweb exeptions handling 
bzr revid: fme@openerp.com-20140130212053-fkb9ug49qun54ehi
 2014-01-30 22:20:53 +01:00
Fabien Meghazi fc979b9a7a [FIX] url_for() 
bzr revid: fme@openerp.com-20140130195043-pkfkmqg80c2yk5p5
 2014-01-30 20:50:43 +01:00
Fabien Pinckaers 51af63eeb7 [FIX] margin left fa-envelop 
bzr revid: fp@tinyerp.com-20140130182558-63lw9szcro3qmjee
 2014-01-30 19:25:58 +01:00
Christophe Simonis fb69a8bf70 [IMP] website: use company logo 
bzr revid: chs@openerp.com-20140130181210-y5zbmtc0fimcn9ia
 2014-01-30 19:12:10 +01:00
Richard Mathot (OpenERP) afdc063112 [MERGE] Sync with trunk-website-al 
bzr revid: rim@openerp.com-20140130073558-afmllqhuwghv374g
 2014-01-30 08:35:58 +01:00