Christophe Simonis
b5914e9ea8
[MERGE] forward port branch 8.0 up to 51561d3
2016-11-14 14:02:41 +01:00
Odoo Translation Bot
fa544c9da0
[I18N] Update translation terms from Transifex
2016-11-13 02:57:18 +01:00
Christophe Simonis
ab8d07cf1f
[MERGE] forward port branch 8.0 up to 86a9b78
2016-11-02 16:50:10 +01:00
Odoo Translation Bot
c340284a60
[I18N] Update translation terms from Transifex
2016-10-30 02:56:40 +02:00
qsm-odoo
389574e550
[FIX] website: make the 'include assets bundle' option of ace editor work
...
Commit which added summernote broke the ace editor with a strange
change: https://github.com/odoo/odoo/commit/9069d0127c176317436b67b23ae5677dd9d53de7#diff-e9d66a1b466f404be082fa00519eafa5L140 .
With this change instead of not including the assets bundles in the ace
editor and allowing to see them by checking the option, the assets
bundles were included when NOT in debug mode and not included when in
debug mode.
2016-10-24 17:22:05 +02:00
Christophe Simonis
1d00e3221d
[MERGE] forward port branch 8.0 up to 8f484fd
2016-10-24 11:48:45 +02:00
Odoo Translation Bot
8f484fd137
[I18N] Update translation terms from Transifex
2016-10-23 02:57:47 +02:00
Christophe Simonis
fa50349d7e
[MERGE] forward port branch 8.0 up to 001610e
2016-10-17 13:01:20 +02:00
Odoo Translation Bot
d1c81f136c
[I18N] Update translation terms from Transifex
2016-10-16 02:57:56 +02:00
Christophe Simonis
67d285b9bc
[MERGE] forward port branch 8.0 up to d3c4ab2
2016-10-10 11:22:55 +02:00
Odoo Translation Bot
d3c4ab23e4
[I18N] Update translation terms from Transifex
2016-10-09 02:56:21 +02:00
Christophe Simonis
858a8b9ef1
[MERGE] forward port branch 8.0 up to 4ab34d4
2016-09-26 13:32:09 +02:00
Odoo Translation Bot
6baef31c8f
[I18N] Update translation terms from Transifex
2016-09-25 02:59:19 +02:00
Christophe Simonis
6a67e5cf42
[MERGE] forward port branch 8.0 up to e083d72
2016-09-22 12:46:30 +02:00
Odoo Translation Bot
6a1ecef775
[I18N] Update translation terms from Transifex
2016-09-18 03:05:57 +02:00
Christophe Simonis
a5dfe2f0d4
[MERGE] forward port branch 8.0 up to 3e4206b
2016-09-14 11:52:24 +02:00
Odoo Translation Bot
40691d31f3
[I18N] Update translation terms from Transifex
2016-09-11 03:04:01 +02:00
Christophe Simonis
f98665f9b6
[MERGE] forward port branch 8.0 up to b17b2a2
2016-09-09 10:52:34 +02:00
Odoo Translation Bot
75a196972e
[I18N] Update translation terms from Transifex
2016-09-04 03:06:55 +02:00
Christophe Simonis
9dc5ee4007
[MERGE] forward port branch 8.0 up to 7b93e1d
2016-09-01 15:46:03 +02:00
Odoo Translation Bot
671fa0c7d4
[I18N] Update translation terms from Transifex
2016-08-29 11:48:02 +02:00
Christophe Simonis
f1cb5179fc
[MERGE] forward port branch 8.0 up to c7d9695
2016-08-25 11:07:14 +02:00
Odoo Translation Bot
29f5719254
[I18N] Update translation terms from Transifex
2016-08-21 03:05:30 +02:00
Christophe Simonis
e5371329f7
[MERGE] forward port branch 8.0 up to 08ed48e
2016-08-19 12:07:14 +02:00
Odoo Translation Bot
71594f5958
[I18N] Update translation terms from Transifex
2016-08-14 03:04:34 +02:00
Odoo Translation Bot
0606247a8b
[I18N] Update translation terms from Transifex
2016-08-07 03:07:40 +02:00
Martin Trigaux
d56b03465f
[I18N] Update translation terms from Transifex
...
Last one before dropping a few non-active languages
2016-08-05 16:12:06 +02:00
Jeremy Kersten
7f6c669530
[FIX] website: /website/info use website.info xmlid
...
When a user try to create a new page info, he is redirected
to the /page/info because the xmlid already exists...
The problem is that this view need to be rendered via the
controller /website/info which gives some extra values (version, ...)
The fix for v8 is to redirect /page/info to /website/info.
In V9, the behavior is changed and one page info-1 will be created.
But this fix is also required for direct access to /page/info.
To do in master: maybe use another xml_id that this basic name 'info'?
This commit fix issue #8022
2016-08-05 12:05:24 +02:00
Christophe Simonis
20db912f77
[MERGE] forward port branch 8.0 up to 1213de3
2016-08-03 14:09:30 +02:00
Odoo Translation Bot
337049baa8
[I18N] Update translation terms from Transifex
2016-07-31 03:07:08 +02:00
Christophe Simonis
eff0a3b049
[MERGE] forward port branch 8.0 up to 84f9cdd
2016-07-25 10:24:33 +02:00
Odoo Translation Bot
84f9cdd1d9
[I18N] Update translation terms from Transifex
2016-07-24 02:59:48 +02:00
Odoo Translation Bot
c3dd308913
[I18N] Update translation terms from Transifex
2016-07-19 12:10:41 +02:00
Christophe Simonis
a039fc509b
[MERGE] forward port of branch 8.0 up to 9650249
2016-07-13 17:26:44 +02:00
Odoo Translation Bot
ef83f798d5
[I18N] Update translation terms from Transifex
2016-07-10 03:01:32 +02:00
Christophe Simonis
5949eedfdb
[MERGE] forward port of branch 8.0 up to 0c3cd7cb
2016-07-08 16:32:10 +02:00
Odoo Translation Bot
1986980a51
[I18N] Update translation terms from Transifex
2016-07-03 02:59:06 +02:00
Christophe Simonis
e68ed417b6
[MERGE] forward port of branch 8.0 up to 3e965ec
2016-06-28 12:23:54 +02:00
Odoo Translation Bot
3e965ecf58
[I18N] Update translation terms from Transifex
2016-06-26 02:57:50 +02:00
Christophe Simonis
4030f2fd32
[MERGE] forward port of branch 8.0 up to 297bbff
2016-06-23 16:21:28 +02:00
Odoo Translation Bot
41ec7eec56
[I18N] Update translation terms from Transifex
2016-06-22 07:12:57 +02:00
Christophe Simonis
b87a93a091
[MERGE] forward port of branch 8.0 up to 5b1beec
2016-06-20 13:34:46 +02:00
Odoo Translation Bot
cd369396d9
[I18N] Update translation terms from Transifex
2016-06-19 02:59:13 +02:00
Christophe Simonis
df95b1fc9d
[MERGE] forward port of branch 8.0 up to baa4cc0
...
# Conflicts:
# addons/account/i18n/bs.po
# addons/account_analytic_default/i18n/lo.po
# addons/account_analytic_plans/i18n/lo.po
# addons/account_bank_statement_extensions/i18n/zh_CN.po
# addons/account_cancel/i18n/ca.po
# addons/account_check_writing/i18n/zh_CN.po
# addons/account_payment/i18n/bs.po
# addons/account_test/i18n/zh_CN.po
# addons/analytic/i18n/te.po
# addons/auth_ldap/i18n/pl.po
# addons/auth_oauth/i18n/bs.po
# addons/auth_oauth/i18n/pl.po
# addons/base_geolocalize/i18n/uk.po
# addons/base_import/i18n/pl.po
# addons/base_import_module/i18n/pl.po
# addons/base_setup/i18n/bs.po
# addons/claim_from_delivery/i18n/zh_CN.po
# addons/crm_claim/i18n/zh_CN.po
# addons/crm_helpdesk/i18n/zh_CN.po
# addons/crm_partner_assign/i18n/pl.po
# addons/crm_profiling/i18n/zh_CN.po
# addons/crm_project_issue/i18n/ca.po
# addons/email_template/i18n/ca.po
# addons/email_template/i18n/zh_CN.po
# addons/event/i18n/da.po
# addons/event_sale/i18n/da.po
# addons/google_calendar/i18n/bs.po
# addons/google_drive/i18n/bs.po
# addons/hr/i18n/cs.po
# addons/hr_expense/i18n/sv.po
# addons/hr_holidays/i18n/pl.po
# addons/hr_payroll_account/i18n/zh_CN.po
# addons/hr_recruitment/i18n/ja.po
# addons/hr_timesheet/i18n/tlh.po
# addons/hr_timesheet_sheet/i18n/fr.po
# addons/im_chat/i18n/bs.po
# addons/im_chat/i18n/da.po
# addons/im_livechat/i18n/bs.po
# addons/l10n_be/i18n/pl.po
# addons/l10n_be_intrastat/i18n/es_DO.po
# addons/l10n_be_intrastat/i18n/lo.po
# addons/l10n_be_invoice_bba/i18n/ca.po
# addons/l10n_be_invoice_bba/i18n/lo.po
# addons/l10n_eu_service/i18n/mk.po
# addons/l10n_in_hr_payroll/i18n/zh_CN.po
# addons/l10n_multilang/i18n/zh_CN.po
# addons/l10n_th/i18n/zh_CN.po
# addons/lunch/i18n/bs.po
# addons/lunch/i18n/pl.po
# addons/lunch/i18n/sv.po
# addons/lunch/i18n/th.po
# addons/marketing/i18n/te.po
# addons/marketing_campaign/i18n/zh_CN.po
# addons/marketing_campaign_crm_demo/i18n/pl.po
# addons/membership/i18n/zh_CN.po
# addons/mrp_byproduct/i18n/ab.po
# addons/mrp_repair/i18n/pl.po
# addons/mrp_repair/i18n/sv.po
# addons/note/i18n/zh_CN.po
# addons/pad/i18n/pl.po
# addons/payment_buckaroo/i18n/pl.po
# addons/payment_ogone/i18n/pl.po
# addons/point_of_sale/i18n/bs.po
# addons/pos_discount/i18n/bs.po
# addons/pos_restaurant/i18n/bs.po
# addons/procurement/i18n/ja.po
# addons/procurement/i18n/sv.po
# addons/product/i18n/bs.po
# addons/product_expiry/i18n/hr.po
# addons/product_expiry/i18n/sv.po
# addons/product_extended/i18n/sv.po
# addons/project/i18n/ja.po
# addons/project_issue/i18n/ja.po
# addons/project_issue/i18n/zh_CN.po
# addons/project_issue_sheet/i18n/zh_CN.po
# addons/purchase/i18n/bs.po
# addons/purchase/i18n/ja.po
# addons/purchase/i18n/nb.po
# addons/purchase/i18n/sv.po
# addons/report/i18n/fr.po
# addons/report/i18n/pt_BR.po
# addons/report_intrastat/i18n/sv.po
# addons/sale/i18n/bs.po
# addons/sale/i18n/ja.po
# addons/sale_crm/i18n/fa.po
# addons/sale_layout/i18n/zh_CN.po
# addons/sale_service/i18n/lo.po
# addons/sales_team/i18n/zh_CN.po
# addons/stock_account/i18n/ja.po
# addons/stock_account/i18n/sv.po
# addons/stock_picking_wave/i18n/lo.po
# addons/subscription/i18n/zh_CN.po
# addons/survey/i18n/mk.po
# addons/survey/i18n/pt_BR.po
# addons/warning/i18n/lo.po
# addons/web/i18n/lo.po
# addons/website_blog/i18n/bs.po
# addons/website_blog/i18n/ja.po
# addons/website_crm_partner_assign/i18n/pl.po
# addons/website_crm_partner_assign/i18n/zh_CN.po
# addons/website_event/i18n/da.po
# addons/website_event/i18n/zh_CN.po
# addons/website_event_sale/i18n/da.po
# addons/website_event_track/i18n/da.po
# addons/website_event_track/i18n/ja.po
# addons/website_event_track/i18n/zh_CN.po
# addons/website_forum_doc/i18n/zh_CN.po
# addons/website_hr_recruitment/i18n/da.po
# addons/website_hr_recruitment/i18n/ja.po
# addons/website_mail/i18n/fr.po
# addons/website_mail/i18n/ja.po
# addons/website_mail_group/i18n/zh_CN.po
# addons/website_quote/i18n/bs.po
# addons/website_sale/controllers/main.py
# addons/website_sale/i18n/bs.po
# addons/website_sale/i18n/fa.po
# addons/website_sale_delivery/i18n/zh_CN.po
# addons/website_sale_options/i18n/lo.po
# openerp/addons/base/i18n/bs.po
# openerp/addons/base/i18n/ka.po
2016-06-14 18:53:27 +02:00
Odoo Translation Bot
3215a81bab
[I18N] Update translation terms from Transifex
2016-06-12 03:06:37 +02:00
Christophe Simonis
ca2dad4c44
[MERGE] forward port of branch 8.0 up to b9a006c
2016-06-06 15:41:50 +02:00
Odoo Translation Bot
eb48b94cea
[I18N] Update translation terms from Transifex
2016-06-05 03:01:35 +02:00
Christophe Simonis
589751ca28
[MERGE] forward port of branch 8.0 up to bde083a
2016-06-02 12:58:48 +02:00
Odoo Translation Bot
cb70a8ff98
[I18N] Update translation terms from Transifex
2016-05-29 02:58:42 +02:00
Christophe Simonis
0de30f4013
[MERGE] forward port of branch 8.0 up to 0af32f3
2016-05-23 15:08:35 +02:00
Christophe Simonis