Commit Graph
74916 Commits
Author SHA1 Message Date
Fabien Meghazi c67092bc37 [WIP] load translation, mhhh
bzr revid: fme@openerp.com-20130926135216-f1b1k6kg04it9dzs
2013-09-26 15:52:16 +02:00
Fabien Meghazi b6e1e1ec71 [MERGE] upstream
bzr revid: fme@openerp.com-20130926133155-y1fz603wa4oxw6g3
2013-09-26 15:31:55 +02:00
Fabien Meghazi 8c25a35cc6 [FIX] Save translations and t-fields
bzr revid: fme@openerp.com-20130926131708-16xmpbrx0vxlgbtw
2013-09-26 15:17:08 +02:00
Christophe Matthieu cc939d65fd [FIX] website: auth for page/ route
bzr revid: chm@openerp.com-20130926131645-ypzyiwloulruq9fq
2013-09-26 15:16:45 +02:00
Christophe Matthieu 9f58a5c082 [IMP] website_sale: add styles selector on product
bzr revid: chm@openerp.com-20130926130954-fxojimjdinepgpjq
2013-09-26 15:09:54 +02:00
Fabien Meghazi da26fe77b9 [IMP] Enabling ckeditor on translatable t-fields
bzr revid: fme@openerp.com-20130926124244-u3e3zhw0npmd4dae
2013-09-26 14:42:44 +02:00
Christophe Matthieu f2a97662cd [IMP] website_sale: add a bin packing method for sort and displayed products in the ecomerce. Fix some inherit of products. improve publish button
bzr revid: chm@openerp.com-20130926112307-xqwih3zlvlsmqq7j
2013-09-26 13:23:07 +02:00
Christophe Matthieu c66c5d5b6a [IMP] change publish button, fix website_sale product order + push top/bottom
bzr revid: chm@openerp.com-20130926111854-22ikjc2enj0hi0qu
2013-09-26 13:18:54 +02:00
Fabien Meghazi 7e085d4d5b [FIX] Do not activate language switcher on non multilang controllers
bzr revid: fme@openerp.com-20130926092543-79b1e4v3gdttok6h
2013-09-26 11:25:43 +02:00
Christophe Matthieu b05cd31b59 [FIX] website_sale: add_to_cart inherit
bzr revid: chm@openerp.com-20130926091825-bfykta69vl3knbxh
2013-09-26 11:18:25 +02:00
Christophe Matthieu 437440e2c9 [IMP] website_sale: demo data and style size datas
bzr revid: chm@openerp.com-20130926081600-o6yp6mbkec8anfr2
2013-09-26 10:16:00 +02:00
Christophe Matthieu cf79e61c36 [FIX] website_sale: inherit_option_id for list view and category view
bzr revid: chm@openerp.com-20130926075650-blc9d3fyj3gbcgoq
2013-09-26 09:56:50 +02:00
Christophe Matthieu cd5a77788d [IMP] website_sale: method get_bin_packing_products or get_products call inside the view
bzr revid: chm@openerp.com-20130926074644-d3bjd8te6ks82u7a
2013-09-26 09:46:44 +02:00
Christophe Matthieu b8f1ffaafc [IMP] website_sale: bin packing product for sweet layout
bzr revid: chm@openerp.com-20130925180538-qnq699csoof8jrt5
2013-09-25 20:05:38 +02:00
ddm e7a469f8bc [IMP] speedup page loading by loading CSS in || before scripts
bzr revid: ddm@openerp.com-20130925155434-mg3v6ur9wh4h3nvj
2013-09-25 17:54:34 +02:00
Fabien Meghazi 0a679573fd [FIX] Use sourc-id in client translator
bzr revid: fme@openerp.com-20130925154214-mrktzf256zjkscy2
2013-09-25 17:42:14 +02:00
ddm 71bb1ca0ce [FIX] Lint errors
bzr revid: ddm@openerp.com-20130925143449-mh0mujo08s4qm2n8
2013-09-25 16:34:49 +02:00
Fabien Meghazi e64c07f049 [FIX] Language in context for qweb translations
bzr revid: fme@openerp.com-20130925114457-ct5v0gefg6gd6ua8
2013-09-25 13:44:57 +02:00
Fabien Meghazi 172ca5f213 [FIX] url_for on single language
bzr revid: fme@openerp.com-20130925093157-2rhvvhe2qsy9e68s
2013-09-25 11:31:57 +02:00
Fabien Meghazi 5a0f580f5a [MERGE] upstream
bzr revid: fme@openerp.com-20130925085226-lonpq3add9eaaf9q
2013-09-25 10:52:26 +02:00
Fabien Pinckaers b0f8591ec2 [IMP] Website blogs
bzr revid: fp@openerp.com-20130924211514-mr59mfwtl5u9z4sd
2013-09-24 23:15:14 +02:00
Fabien Pinckaers 0bd7ad63e3 [IMP] blogs layout
bzr revid: fp@openerp.com-20130924204238-eg086hqaja9el5qw
2013-09-24 22:42:38 +02:00
Fabien Pinckaers 18593bb392 [IMP] css
bzr revid: fp@tinyerp.com-20130924193943-8c7lwmkjna1ddha1
2013-09-24 21:39:43 +02:00
Fabien Pinckaers 73cc9fc0e5 [IMP] Blogs + Small CSS on empty blocks
bzr revid: fp@tinyerp.com-20130924193819-hhil6lvkhm9krwg8
2013-09-24 21:38:19 +02:00
Fabien Meghazi f79d27e9a3 [FIX] Update translations
bzr revid: fme@openerp.com-20130924190637-0qgzp58lzan8j1oc
2013-09-24 21:06:37 +02:00
Christophe Matthieu bd16487da1 [IMP] website_sale: change css and demo data
bzr revid: chm@openerp.com-20130924152639-v6hr0laatjcbxe39
2013-09-24 17:26:39 +02:00
Thibault Delavallée f702cafdc5 [FIX] [CLEAN] website_project: added controller and dummy template for task. Will have to be improved, but at least we have a controller. Some cleaning has been performed, notably about indentation.
bzr revid: tde@openerp.com-20130924145445-udqk94zvwq72mr24
2013-09-24 16:54:45 +02:00
Xavier Morel 0cfd15ff72 [IMP] remove unnecessary intermediate updating of values parameter to render
bzr revid: xmo@openerp.com-20130924144018-dz68g882mpj4rmt8
2013-09-24 16:40:18 +02:00
Xavier Morel 2c4560aca6 [ADD] edition of link labels via dialog
bzr revid: xmo@openerp.com-20130924135120-epq1w7wb1a6jfxqn
2013-09-24 15:51:20 +02:00
Thibault Delavallée 0c040ae237 [MERGE] [IMP] [DEMO] event, website_event improvements
[IMP] [DEMO] event: cleaned demo data. Also renamed note field into description, and moved it out of groups_noone, in order to effectively use it to hold the html description of the event.

[IMP] event_sale: cleaned demo data

[ADD] website_mail: added mail_thread file that hold website_message_ids field, holding published comments. Use it for public objects. However as inheritance seems to be still buggy, this field is redefined in website_blog and website_event (at least) to be able to use it. Remove specific declarations when the bug is fixed.

[IMP] [ADD] website_event:
- added skeleton directory for doc
- added skeleton directory for tests
- added dependency towards website_mail module, to benefit from follow feature
- cleaned demo data
- use website_mail for follow / unfollow mechanism
- added website_message_ids field, use it in view
- some improvements in website view (title, event description)

[FIX] website_sales: somewhat fixed partner information fetch in checkout; whole code of those controllers is really obfuscated and very dubious.

bzr revid: tde@openerp.com-20130924130517-hzi2qm108ec65viq
2013-09-24 15:05:17 +02:00
Thibault Delavallée 39726ffe2d [CLEAN] removed print statement
bzr revid: tde@openerp.com-20130924124426-7pz7a9cinllcnspn
2013-09-24 14:44:26 +02:00
Thibault Delavallée ac2384ee47 [IMP] website_sale: basic cleaning of checkout method about getting partner data. In view, do not use get when the data, use brackets, this helps tracking issues in your process.
bzr revid: tde@openerp.com-20130924124253-gld6lwzm3dc8bhwn
2013-09-24 14:42:53 +02:00
Thibault Delavallée 90eba9e022 [MOVE] Do not be afraid to put different models in different files. Stop putting shit everywhere.
bzr revid: tde@openerp.com-20130924121944-ifjosr5yol6b9tsy
2013-09-24 14:19:44 +02:00
Christophe Matthieu f181f21cf4 [IMP] website: publish button with link to backend
bzr revid: chm@openerp.com-20130924115004-xjpy6sayze2she1w
2013-09-24 13:50:04 +02:00
Xavier Morel 8b06e72716 [FIX] block-level links
bzr revid: xmo@openerp.com-20130924112402-twcgdh0b18vzdwru
2013-09-24 13:24:02 +02:00
Thibault Delavallée d2e2c6065b [ADD] website_mail: added forgotten mail_thread file
bzr revid: tde@openerp.com-20130924112152-2n1h04qaicmvocqa
2013-09-24 13:21:52 +02:00
Thibault Delavallée b1f327c985 [MERGE] Merged with main website branch
bzr revid: tde@openerp.com-20130924112050-yzrhf7pm32ikzb31
2013-09-24 13:20:50 +02:00
Thibault Delavallée 6a3939f932 [IMP] website_event: title of the main events page summarises the search
bzr revid: tde@openerp.com-20130924111957-mzxnibdgbb8d09zo
2013-09-24 13:19:57 +02:00
Xavier Morel 7533fe77b4 [FIX] paste in webkit-ish browsers
clipboard plugin was getting lost due to method used to get a readonly
toplevel editor with editable sub-sections in it.

The clipboard plugin creates a hidden pasteboard element to safely get
a the clipboard data before inserting it at paste point, this
clipboard may have to be made @contenteditable if it's created in a
readonly area. Which was the case here: the pasteboard was inserted at
the root of the editor, which is not editable.

But because of @data-cke-editable being explicitly set, ckeditor would
believe it had inserted the pasteboard in an editable section and thus
would *not* set its @contenteditable leading to a useless readonly
pasteboard.

The purpose of @data-cke-editable was to make the editor itself
"editable" for cke (in order for the toolbar to not be disabled) while
it would not actually be editable (@contenteditable) for users.

This is better reimplemented by calling API methods to make the editor
editable but its root element not editable, one of the improvements
being that commands (and thus toolbar buttons) now switch state
correctly based on context.

bzr revid: xmo@openerp.com-20130924110601-gfvc395rsedpnoh3
2013-09-24 13:06:01 +02:00
Thibault Delavallée 95e7c0f61c [IMP] website_event: use website_mail follow template and controller instead of redefining it
bzr revid: tde@openerp.com-20130924105206-9fhzpd3f3os1eyar
2013-09-24 12:52:06 +02:00
Thibault Delavallée 5a0236e014 [IMP] event: added oe_structure in demo data
bzr revid: tde@openerp.com-20130924105133-69gr0610fnc7310z
2013-09-24 12:51:33 +02:00
Christophe Matthieu 02f2f28b42 [FIX] website/image controller display image if website_published
bzr revid: chm@openerp.com-20130924102921-ca83jve77j0su2zu
2013-09-24 12:29:21 +02:00
Christophe Matthieu 51fae1fcf8 [IMP] website_sale display only non empty category in non editable mode
bzr revid: chm@openerp.com-20130924102834-op0bm475w20x35j4
2013-09-24 12:28:34 +02:00
Thibault Delavallée 620e527116 [IMP] website_event: removed description_website, now using standard description field.
Cleaned demo data.

bzr revid: tde@openerp.com-20130924102651-fym6t9mgq6mpy3kz
2013-09-24 12:26:51 +02:00
Fabien Meghazi bcd3f471ad [IMP] persistence of dialog opt out
bzr revid: fme@openerp.com-20130924102305-dxyxq56imz1xeul8
2013-09-24 12:23:05 +02:00
Thibault Delavallée 754fbd0d79 [IMP] event_sale: cleaned demo data, using standard xml_ids.
Also removed website_published and description website fields, not necessary at all.

bzr revid: tde@openerp.com-20130924101924-0onpypxq0806dzb7
2013-09-24 12:19:24 +02:00
Thibault Delavallée 4c7d96e33d [IMP] event:
- note (Description field) is renamed into Description and set to an html field
- added demo data from website_event to base event, no need to add a new field and to delay demo data
- updated form view

bzr revid: tde@openerp.com-20130924101020-b1xx96vdgcfd2mz2
2013-09-24 12:10:20 +02:00
Fabien Meghazi f46550fa27 [IMP] Use t-href in main template
bzr revid: fme@openerp.com-20130924095242-2fzuptg63h63t79y
2013-09-24 11:52:42 +02:00
Fabien Meghazi 5c3806d2f2 [ADD] Usable url_for
bzr revid: fme@openerp.com-20130924095109-5e6tvd34amns0t84
2013-09-24 11:51:09 +02:00
Christophe Matthieu abc273e9a1 [IMP] website_sale: change size y when category is displayed
bzr revid: chm@openerp.com-20130924085507-9m1gsdnlsfgn4fj4
2013-09-24 10:55:07 +02:00