Commit Graph

193 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Antony Lesuisse 87172d90d2 [MERGE] saas-3
bzr revid: al@openerp.com-20140209140315-ukqlf90ngy6ycu2k
2014-02-09 15:03:15 +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
Fabien Meghazi 5451f5587d [REV] Bring back QWebExceptions
bzr revid: fme@openerp.com-20140131113611-wee3xvnvzw9smq2r
2014-01-31 12:36:11 +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
Antony Lesuisse 632c014b76 [FIX] fix werkzeug dependency on debian, misc changes
- add an more friendly syntax for images /website/image/<model>/<id>/<field>
- reorder methods based on their use case
- move new page to /website namespace

bzr revid: al@openerp.com-20140129163809-d4z4f8t3h11n5ozv
2014-01-29 17:38:09 +01:00
Fabien Meghazi 326c35aecd [IMP] Merge bananas and cumcumbers in order to prepare the t-href|t-action removal
bzr revid: fme@openerp.com-20140128201417-1elmttz8qen9q3ws
2014-01-28 21:14:17 +01:00
Antony Lesuisse 7c90d3afa5 [FIX] website page creation
bzr revid: al@openerp.com-20140128140017-r8yy8tzsvo4y0e92
2014-01-28 15:00:17 +01:00
Christophe Matthieu d588e44d34 [IMP] event,event_sale: refactoring; remove crappy 9999 hardcoded values; remove visibility; add constraints
[FIX] remove module_portal_anonymous ref
[IMP] website: res_config with wizard
[IMP] event: remove related field to res.partner
[FIX] website_sale: change crappy _get_pricelist method (who return a browse record to a function field type many2one)

bzr revid: chm@openerp.com-20140128092037-zrrbz1hrmgat88o4
2014-01-28 10:20:37 +01:00
Christophe Matthieu 43044d8ee7 [IMP] event,event_sale: refactoring; remove crappy 9999 hardcoded values; remove visibility; add constraints
bzr revid: chm@openerp.com-20140127135828-z848mvpis5d9xyh8
2014-01-27 14:58:28 +01:00
Fabien Meghazi a2fb618354 [FIX] do not crash when trying to rescue a wrong t-call in template
Need trunk-website-al server's Rev#5173

bzr revid: fme@openerp.com-20140127114034-luhekopukpbmntqt
2014-01-27 12:40:34 +01:00
Fabien Pinckaers 28a0355775 [IMP] website_quote new modules + small fixes
bzr revid: fp@tinyerp.com-20140125234925-mlg0rlwg3moiueuk
2014-01-26 00:49:25 +01:00
Fabien Pinckaers d820b63956 [IMP] clean 404
bzr revid: fp@tinyerp.com-20140125225233-rkvsavn6np5s0z3e
2014-01-25 23:52:33 +01:00
Fabien Pinckaers ec9d4b6613 [FIX] CSS bug in menu when edit
bzr revid: fp@tinyerp.com-20140125132939-byp7m5p699cbc77j
2014-01-25 14:29:39 +01:00
Christophe Simonis 79fc8d3d20 [FIX] website: select2 is now included in web module
bzr revid: chs@openerp.com-20140124155944-sfre35hkyk0dxcnb
2014-01-24 16:59:44 +01:00
Xavier Morel ce155acefe [IMP] with device-width, iOS devices don't respond to orientation changes. Use initial-scale instead
bzr revid: xmo@openerp.com-20140124135713-e0uzbnaq5m9hiocr
2014-01-24 14:57:13 +01:00
Xavier Morel 11c2325374 [ADD] viewport meta, so the responsive bootstrapy stuff actually does things
bzr revid: xmo@openerp.com-20140124134729-epag5dnbjk8y2hcw
2014-01-24 14:47:29 +01:00