Commit Graph

313 Commits

Author SHA1 Message Date
Antony Lesuisse 2d296cb779 [MERGE] ir-ui-view split active and show_customize
Split the ternary field application in active and show_customize, all four
possible value are now needed for the customize theme popup.
2014-08-31 16:56:44 +02:00
Fabien Pinckaers 856daf8df9 [IMP] expl p 2014-08-26 21:45:52 +02:00
Fabien Pinckaers 8aca457e34 [IMP] Updated website urls on modules and info page 2014-08-26 21:40:18 +02:00
Fabien Meghazi 18068a5e79 [FIX] website.layout hreflangs
- First line is not correct due to url_for() refactoring's leftover
- href's should be full urls with domain name
- Use short language for hreflang if possible
2014-08-25 17:43:39 +02:00
Olivier Dony 4114c761dd [IMP] website: do not translate sitemap URL 2014-08-13 10:51:39 +02:00
Fabien Pinckaers f43e349d85 [IMP] Footer message according to installed apps 2014-08-12 13:06:08 +02:00
Denis Ledoux ae65be2b2a [MERGE] forward port of branch saas-5 up to 0739bc4 2014-08-11 15:58:02 +02:00
Denis Ledoux 7c647ec876 [MERGE] forward port of branch saas-4 up to 0a1e4a0 2014-08-08 17:27:29 +02:00
Jeremy Kersten 8286d4306a [FIX] wesbite: update google analytics snippet according to google recommandation 2014-08-08 15:51:35 +02:00
Olivier Dony d706adba11 [MERGE] Forward-port saas-5 up to 37ba23d 2014-08-04 01:44:30 +02:00
Olivier Dony b7814943c3 [MERGE] Forward-port saas-3 up to 7273474 2014-08-01 23:14:59 +02:00
Olivier Dony 7273474d65 [MERGE] Forward-port saas-3 up to fc92027 2014-08-01 23:10:29 +02:00
Olivier Dony fc92027979 [FIX] website: OpenERP->Odoo in website footer 2014-08-01 23:04:42 +02:00
Julien Legros b20636e0b2 [FIX] website: update url in the footer 2014-08-01 15:33:58 +02:00
Olivier Dony 13fb4f2e62 [FIX] website: more robust inherit between footer_custom and footer_default 2014-07-25 10:59:49 +02:00
Xavier Morel 7c540bc4ee [FIX] exception rendering with pretty printed XML
had not been migrated to lxml
2014-07-14 13:44:37 +02:00
Christophe Simonis f654a7719b [MERGE] forward port of branch saas-5 up to 73d39a0 2014-07-10 22:49:53 +02:00
Jeremy Kersten 8eb97cc082 [IMP] website_sale: Add google analytics on checkout process 2014-07-09 17:45:40 +02:00
Christophe Matthieu e851c36a0f [FIX] website: error for rendering of the sitemap template. qweb can't render the xmlns attribute. 2014-07-09 16:03:54 +02:00
Olivier Dony 34bfa1b44f [MERGE] Forward-port saas-5 up to d9cda97 2014-07-05 01:45:45 +02:00
Olivier Dony d9cda97cf4 [MERGE] Forward-port saas-4 up to 5ceded9 2014-07-05 01:28:19 +02:00
Olivier Dony 5ceded9d69 [MERGE] Forward-port saas-3 up to 4fa30f5 2014-07-05 01:04:19 +02:00
Martin Trigaux a6bf8cd07b [FIX] website: avoid divisions by zero when no record to display 2014-07-02 16:25:24 +02:00
Simon Lejeune 20f4da67b3 Merge remote-tracking branch 'odoo/master' into master-report-translation-fix-sle 2014-06-27 18:17:15 +02:00
Christophe Simonis 1f57528bc6 [MERGE] forward port of branch saas-5 up to 8dfd5ea 2014-06-27 16:14:40 +02:00
Christophe Simonis 8dfd5eab01 [MERGE] forward port of branch saas-4 up to a4bc65c 2014-06-27 16:08:09 +02:00
Christophe Simonis a4bc65cdba [MERGE] forward port of branch saas-3 up to bdc4dd4 2014-06-27 16:06:37 +02:00
Olivier Dony 9c5ecd3bc4 [FIX] website: avoid hiding the signin info for users who are not employees nor portal users
This happens when you do a plain signup, you
end up as neither an employee nor a portal user,
but should still now when you are logged in.
2014-06-27 13:04:42 +02:00
Simon Lejeune fc8592adf2 [FIX] Report: translation fixed, use of 'primary clone' of web.layout and website.layout, minimal template is now a QWeb template 2014-06-27 12:00:49 +02:00
Simon Lejeune 195fa93168 [MERGE] backend front end integration
Render the top-menu (backend menu or frontend editbar) server-side.
Use Fontawesome icons (mail, timezone, chat).
Refactor website widgets, split Website.editorBarin editorbar, ace, editorbar- content, editorbarCustomize.
2014-06-27 11:03:34 +02:00
Christophe Simonis 8cbaf52fd3 Revert "Saas 5 report translation fix sle" 2014-06-26 18:14:44 +02:00
Simon Lejeune b8cea9e60f [REV] revert unneeded changes in website layout 2014-06-26 17:04:16 +02:00
Christophe Matthieu 77a07670cf [IMP] website: move custom scripts in the assets; fix website_sale_option to display modal in grid view 2014-06-25 14:03:23 +02:00
xmo-odoo 3160eb74c4 Merge pull request #584 from xmo-odoo/master-qweb-groups-xmo
`@groups` attribute in qweb views
2014-06-18 09:37:02 +02:00
xmo-odoo c949509b5e Merge pull request #463 from xmo-odoo/qweb-foreach
Qweb foreach
2014-06-17 15:56:09 +02:00
Xavier Morel 79e10200d5 [IMP] prevent edition of page if groups which current user doesn't have
If the current view uses @groups attributes (possibly in called templates),
the corresponding elements are rendered to a void (empty string in qweb). If
said user can edit the page, does so and saves a view section in which there's
a @groups to which he has no access, the element[@groups] is completely
removed from the template once saved, losing it.

If QWeb encounters an @groups to which the current user has no right during
rendering, have it request a no-RTE page, so the user can not RTE-edit the
page (or drop snippets in it).
2014-06-17 12:01:52 +02:00
Richard Mathot ab3231d6c9 [REF] website: change URL to new Odoo website 2014-06-16 13:49:39 +02:00
Simon Lejeune 10a0edce11 [FIX] request unbound during test execution, add condition in website.layout and livechat 2014-06-11 22:56:55 +02:00
Simon Lejeune 9482bc8f19 [FIX] attempt to render website.layout during test execution 2014-06-11 19:17:56 +02:00
Christophe Simonis ccdae747a0 [MERGE] forward port of branch saas-5 up to a7c2125 2014-06-10 13:19:55 +02:00
Christophe Simonis a7c2125735 [MERGE] forward port of branch saas-4 up to 6b8e972 2014-06-10 13:15:46 +02:00
Christophe Simonis 6b8e9727e5 [MERGE] forward port of branch saas-3 up to 4601d85 2014-06-10 12:29:47 +02:00
Xavier Morel a9a83d00c9 [REM] python-qweb support for as-less foreach 2014-06-05 17:49:08 +02:00
Denis Ledoux 9bcda15b97 [FIX] website: prevent to split google analytics script 2014-06-04 16:15:16 +02:00
Richard Mathot 8dc0503aa5 [FIX] website*: make custom footer independant of main layout 2014-06-02 16:56:36 +02:00
Richard Mathot fe3775b96f [FIX] website: remove standard footer from the DOM instead of hiding it 2014-06-02 12:10:56 +02:00
Olivier Dony 04211015fc [MERGE] Forward-port of latest saas-4 fixes, up to 0452851 2014-05-27 20:49:49 +02:00
Xavier Morel e06f5b414b [IMP] inherit_option_id -> application 2014-05-27 12:13:51 +02:00
Richard Mathot e137a7713b [FIX] website_sale: test did not load js properly and failed 2014-05-26 16:58:14 +02:00
Richard Mathot b0e263d00f [REF] website: shorter tag for charset 2014-05-26 08:51:38 +02:00