Christophe Simonis dda0d3d62d [MERGE] forward port of branch saas-10 up to baf494c ...

# Conflicts:
#	addons/hr_timesheet/project_timesheet.py
#	addons/sale_layout/i18n/es_PE.po
#	addons/sale_layout/i18n/hu.po
#	addons/sale_layout/i18n/lo.po
#	addons/sale_layout/i18n/pl.po
#	addons/sale_service/i18n/es_MX.po
#	addons/sale_service/i18n/es_PE.po
#	addons/sale_service/i18n/lo.po
#	addons/stock/stock.py
#	addons/stock/stock_view.xml
#	addons/warning/i18n/es_PE.po
#	addons/warning/i18n/lo.po
#	addons/warning/i18n/ru.po
#	addons/web/i18n/cs.po
#	addons/web/i18n/ja.po
#	addons/web/i18n/lo.po
#	addons/web/i18n/th.po

2016-06-15 12:59:39 +02:00

..

controllers

[MERGE] forward port of branch saas-6 up to 12d7996

2015-12-08 15:17:06 +01:00

i18n

[MERGE] forward port of branch 9.0 up to bfbe2d6

2016-06-14 19:27:16 +02:00

security

…

static/src/img

[IMP] auth_oauth: Update the tutorial 'Sign in with gmail'

2016-03-09 15:07:51 +01:00

views

…

__init__.py

…

__openerp__.py

[IMP] __openerp.py__ files : remove all occurence of authors and website

2015-08-20 16:15:59 +02:00

auth_oauth_data.xml

[MERGE] forward port of branch saas-6 up to 8d95f6d

2015-08-15 16:57:35 +02:00

auth_oauth_data.yml

…

auth_oauth_view.xml

…

auth_oauth.py

[IMP] web_linkedin : remove the related description

2015-05-08 17:31:30 +02:00

ir_configparameter.py

[FIX] base: fix and complete migration of base/ir

2016-03-21 13:46:44 +01:00

res_config.py

[IMP] auth_oauth: Update the tutorial 'Sign in with gmail'

2016-03-09 15:07:51 +01:00

res_config.xml

[IMP] auth_oauth: Update the tutorial 'Sign in with gmail'

2016-03-09 15:07:51 +01:00

res_users.py

[MERGE] forward port of branch saas-8 up to 3c7b08c

2016-01-12 18:48:49 +01:00

res_users.xml

[FIX] addons: view extensions are no longer based on attribute string

2015-07-06 16:58:04 +02:00