Commit Graph
83232 Commits
Author SHA1 Message Date
Xavier Morel 6900662b54 [FIX] page creation broken because what is grep
bzr revid: xmo@openerp.com-20140207145149-fem1wnr0t10rcgsn
2014-02-07 15:51:49 +01:00
Christophe Simonis b13aae9f91 [FIX] auth_oauth_signup: show providers on signup page
bzr revid: chs@openerp.com-20140207145302-o2erxe3mxjvzqst5
2014-02-07 15:53:02 +01:00
Quentin (OpenERP) af58fb0b16 [MERGE] fix sale order wokflow when it was in shipping exception (+improved the SO copy())
lp bug: https://launchpad.net/bugs/1271603 fixed

bzr revid: qdp-launchpad@openerp.com-20140207144148-3e823dk9ovkx0zig
2014-02-07 15:41:48 +01:00
Christophe Matthieu f767f6ca47 [FIX] website tour test: import with ajax insead of jquery (and auto load jquery)
bzr revid: chm@openerp.com-20140207143437-uptdehmpegzze61y
2014-02-07 15:34:37 +01:00
Christophe Matthieu d432e56661 [FIX] website: for activate test on runbot
bzr revid: chm@openerp.com-20140207143241-e4u7ikvgbl0f980d
2014-02-07 15:32:41 +01:00
Gery Debongnie 817b9bdb7f [IMP] removes the 'expand all' buttons, it was confusing and not really useful (addon web_graph)
bzr revid: ged@openerp.com-20140207142223-pc31xwv7kckt99a0
2014-02-07 15:22:23 +01:00
Christophe Matthieu 598d811ea7 [MERGE] from saas-3
bzr revid: chm@openerp.com-20140207140912-2tu1bhpvlap0fa4m
2014-02-07 15:09:12 +01:00
Antony Lesuisse cd2bddad46 [FIX] website ir.ui.view render
bzr revid: al@openerp.com-20140207140503-doolcovzuce4m6i4
2014-02-07 15:05:03 +01:00
Fabien Pinckaers 5f6f08899b [IMP] insert a banner --> build a page
bzr revid: fp@tinyerp.com-20140207135946-7gkzt6zodhf0hdxi
2014-02-07 14:59:46 +01:00
Gery Debongnie 88b7511f68 [FIX] correctly use the col group by instead of groupby when reading the context and initializing a graph view (addon web_graph)
bzr revid: ged@openerp.com-20140207135339-ohrjh6uvu22tjavh
2014-02-07 14:53:39 +01:00
Gery Debongnie ab9300e995 [REF] removes some useless lines that should have been removed earlier when reworking the reporting views in addon crm
bzr revid: ged@openerp.com-20140207135134-wqklenfb1qarwv63
2014-02-07 14:51:34 +01:00
Gery Debongnie 04301f3b1e [FIX] correct various actions in kanban view in sales team: now the user can go to the various reporting view in graph view (addons crm/sale_crm)
bzr revid: ged@openerp.com-20140207135038-6tx5ywxxdxywn8cb
2014-02-07 14:50:38 +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 25117ffd0b [FIX] tour test log error
bzr revid: chm@openerp.com-20140207134548-lr2563gtlgjphxrp
2014-02-07 14:45:48 +01:00
Christophe Matthieu 76841f14e4 [FIX] website: snippet: display baner in mobile view; background cover insead of 100%; paralax scrolling
bzr revid: chm@openerp.com-20140207133712-srtik2knhwyybgse
2014-02-07 14:37:12 +01:00
Christophe Matthieu 6cb5b1e556 [FIX] website: test tour: use admin insead of tools.config['admin_passwd']
bzr revid: chm@openerp.com-20140207130104-nuwurzlsvt4cu1jr
2014-02-07 14:01:04 +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
Thibault Delavallée c27dfb92ea [IMP] website: server action: demo data now have website_path
bzr revid: tde@openerp.com-20140207123355-t3hxvqxjr5p8p0du
2014-02-07 13:33:55 +01:00
Thibault Delavallée 167ac762ca [IMP] website: server action: display website_url in tree view
bzr revid: tde@openerp.com-20140207123301-4guyw8ay4e6fghuj
2014-02-07 13:33:01 +01:00
Thibault Delavallée 21602f92a1 [FIX] website: server action: compute website_url only for published code actions
bzr revid: tde@openerp.com-20140207123249-yfql78xurblyamze
2014-02-07 13:32:49 +01:00
Christophe Simonis 1b0ce7052e [FIX] website: do not force uneditable templates
bzr revid: chs@openerp.com-20140207122837-ysfss4khpt2hsau1
2014-02-07 13:28:37 +01:00
Thibault Delavallée c7b90329cd [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140207121941-hzzbc2qk40ukahvy
2014-02-07 13:19:41 +01:00
Thibault Delavallée 7d696bc620 [IMP] website: server actions: usability improvements
- added website_path, the end of the path to access the server action, allowing more custom
and short URLs, like website/action/partners instead of website/action/website.action_partners;
- added website_url, computed file with the full address of the server action that is displayed
on the form view, to ease usability
- updated server action contorller: now takes xml_id, id, or website_path

bzr revid: tde@openerp.com-20140207121921-7kdpxrf30zlte47l
2014-02-07 13:19:21 +01:00
Martin Trigaux 9f4daa71e8 [FIX] gamification: various fixes
- generates automatically goals when adding somebody to a challenge
- when serialising data, skip lines and challenges with no generated goals
- hr_gamification as auto install (when get hr and gamification)
- related field challenge_id on gamification.goal is always readonly, add helper
- convert missed type->definition conversion in filter name (goal history menu will group by user and definition)
- invert challenges and goals menus in setting list (as encourage people to create challenges instead of goals)

bzr revid: mat@openerp.com-20140207121637-73a4lhvk7bonibiu
2014-02-07 13:16:37 +01:00
Christophe Matthieu b71ef0541e [FIX] website test phantomjs login
bzr revid: chm@openerp.com-20140207115903-kzf9ikk37xvtq0ef
2014-02-07 12:59:03 +01:00
Christophe Matthieu 22a27ed953 [MERGE] Microformats (microdata) support for improved SEO.
Supported formats:
 - Organization
   https://support.google.com/webmasters/answer/146861?hl=en&ref_topic=1088474
   http://schema.org/Organization
 - Event
   https://support.google.com/webmasters/answer/164506?hl=en&ref_topic=1088474
   http://schema.org/Event
 - Product+Offer
   https://support.google.com/webmasters/answer/146750#offer_properties
   http://schema.org/Product
   http://schema.org/Offer

Tested with http://www.google.com/webmasters/tools/richsnippets

bzr revid: chm@openerp.com-20140207113721-klunj6bf9qp4b2cx
2014-02-07 12:37:21 +01:00
Cedric Snauwaert 31348b1e4a [FIX]sale_order with product using phantom bom
bzr revid: csn@openerp.com-20140207112606-k0cxzhpytlodjd1y
2014-02-07 12:26:06 +01:00
Quentin (OpenERP) f9d3e8a39e [REF] some refactoring, bug fixes made during code review
bzr revid: qdp-launchpad@openerp.com-20140207111349-2zjysk3w1p0daeaj
2014-02-07 12:13:49 +01:00
Christophe Matthieu 7f241d4245 [FIX] website: snippet option: background style is required
bzr revid: chm@openerp.com-20140207105722-6wfbfw5mj5937t03
2014-02-07 11:57:22 +01:00
Martin Trigaux 8e97edb976 [IMP] gamification: put challenge list above goals to be more user friendly
bzr revid: mat@openerp.com-20140207105529-4a95snjwpc11he6k
2014-02-07 11:55:29 +01:00
Fabien Pinckaers 02aff66446 [FIX] layout bug, right alignment of blocks incorrect
bzr revid: fp@tinyerp.com-20140207104831-s52wrim8r8k7eqox
2014-02-07 11:48:31 +01:00
Denis Ledoux 4ecf5bb09a [FIX] mail: create and edit of template_id in compose message now works, as we pass the template model in context (among others useful default value)
bzr revid: dle@openerp.com-20140207104637-lkx5am24608n8jka
2014-02-07 11:46:37 +01:00
Martin Trigaux b8b6a3651a [FIX] gamification: convert missed type to definition filter (goal history menu will group by user and definition)
bzr revid: mat@openerp.com-20140207103357-7v8seoqgq9rokhhi
2014-02-07 11:33:57 +01:00
Martin Trigaux 838fe32a98 [IMP] gamification: related field challenge_id is always readonly, add helper
bzr revid: mat@openerp.com-20140207102705-cf5aue57qzo03rlq
2014-02-07 11:27:05 +01:00
Thibault Delavallée c02a510889 [IMP] website_mail: email designer: improved template + link to backend
bzr revid: tde@openerp.com-20140207102124-5joee7c201fmxizu
2014-02-07 11:21:24 +01:00
Martin Trigaux 344452e73a [FIX] hr_gamification: add auto_install to attribute, when get gamification and hr, automatically installed
bzr revid: mat@openerp.com-20140207102029-6y45r4cmrc1h8kx7
2014-02-07 11:20:29 +01:00
Christophe Matthieu 8879fb1728 [FIX] website snippet: reset snippet-editor and overlay because the rte re-generate the dom and cancelled all snippet datas
bzr revid: chm@openerp.com-20140207100734-pdzr0qz8mtmha96m
2014-02-07 11:07:34 +01:00
Martin Trigaux f988e74828 [FIX] gamification: when serialising data, skip lines and challenges with no goals
bzr revid: mat@openerp.com-20140207093643-vr1on5oxqtzkalj9
2014-02-07 10:36:43 +01:00
Martin Trigaux 691d305ed9 [FIX] gamification: automatically generates goals for users when adding them to a new challenge
bzr revid: mat@openerp.com-20140207092411-yju3pif1ibipcff8
2014-02-07 10:24:11 +01:00
Thibault Delavallée d26919f73e [IMP] website_mail: reordered email snippets, added 2 and 3 columns in basic email structures
bzr revid: tde@openerp.com-20140207091907-6brx7m2i69mo9ow0
2014-02-07 10:19:07 +01:00
Quentin (OpenERP) 860cdf9d34 [MERGE] main trnk-wms branch
bzr revid: qdp-launchpad@openerp.com-20140207085946-iwwnyivpsl6r2af8
2014-02-07 09:59:46 +01:00
Thibault Delavallée 1e2452fb1a [IMP] website_mail: email designer snippets categories better explained, to avoid
confusion with the classic html editor

bzr revid: tde@openerp.com-20140207084137-zk2o3nn7ml84axa6
2014-02-07 09:41:37 +01:00
Quentin (OpenERP) 38577e23f4 [IMP] stock, usability: changed a button label and translate the information on availability of moves into the move uom
bzr revid: qdp-launchpad@openerp.com-20140207084000-k7uhl82v9mlmuc92
2014-02-07 09:40:00 +01:00
Christophe Matthieu 4663f5b10c [IMP] website test: add a timeout in phantom js to raise a better error and improve log error
bzr revid: chm@openerp.com-20140207074745-ffrcoi2aj5m67i8m
2014-02-07 08:47:45 +01:00
Christophe Matthieu 062c491488 [IMP] website test_ui: add a try catch in run and run_test to display error
bzr revid: chm@openerp.com-20140206175113-w0qscfngebnn7718
2014-02-06 18:51:13 +01:00
Christophe Simonis 4b22c30888 [FIX] auth_signup: keep query when generating links
bzr revid: chs@openerp.com-20140206164020-2yuf5xdciabt4zsp
2014-02-06 17:40:20 +01:00
Christophe Simonis daace48560 [MERGE] fix template rendering
bzr revid: chs@openerp.com-20140206163811-i43srg7hd4yqzzo3
2014-02-06 17:38:11 +01:00
Christophe Matthieu 97091c31ae [IMP] website: reduce run test of banner
bzr revid: chm@openerp.com-20140206161614-afam16q12ci0kr7l
2014-02-06 17:16:14 +01:00
Fabien Meghazi 2d4fb97696 [IMP] Move some qweb rendering context vars from website#ir.qweb to server#ir.ui.view
bzr revid: fme@openerp.com-20140206161316-jw7luqon476widcm
2014-02-06 17:13:16 +01:00
Fabien Meghazi 297781df08 [IMP] Move some qweb rendering context vars from website#ir.qweb to server#ir.ui.view
bzr revid: fme@openerp.com-20140206161204-vp6kydvdxhg5qykx
2014-02-06 17:12:04 +01:00