lp:~openerp-dev/openobject-addons/saas-3-snippet-selection

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:~openerp/openobject-addons/saas-3

OpenERP Core Team: Pending requested 2014-02-27

Diff: 12 lines (+1/-1)

1 file modified

website/static/src/js/website.snippets.editor.js (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

9215. By Paramjit Singh Sahota(OpenERP) on 2014-02-26

[FIX] Not sure about the fix but it worked for now.

9214. By jke-openerp on 2014-02-25

[FIX] Set event from hr_holiday with a class confidential by default.

9213. By jke-openerp on 2014-02-25

[FIX] Use event.display_time and not event.date in mail template. This function field use the timezone !

9212. By jke-openerp on 2014-02-25

[MERGE] Fix bug in send_mail_to_attendee of calendar where we passed browse_list and not dict(ids), typo controller calendarr PEP8

9211. By jke-openerp on 2014-02-20

[FIX] Disable traceback popup when rpc /calendar/notify fail

9210. By Christophe Matthieu (OpenERP) on 2014-02-25

[FIX] website: error managment in ace editor for ie9

9209. By Christophe Matthieu (OpenERP) on 2014-02-25

[FIX] website: fix for ie: add bootstrap class in website_sale and bind click for editor

9208. By Christophe Simonis (OpenERP) on 2014-02-25

[FIX] crm: lead to opportunity convertion: pass id instead of browse record object

9207. By Xavier (Open ERP) on 2014-02-25

[FIX] tags edition breakage in website_event_track

* remove some nodes from the $editables set, ``li`` really does not like being
  widgetified. Remove a few others just in case

* split fa outside of li to make it safely (ish) editable

* simplify upcast function for icons cke widget

9206. By Olivier Dony (Odoo) on 2014-02-25

[FIX] website_event_track: employees should not be restricted to public events only

Also switched rule to noupdate. A manual fix of existing installations
will be necessary, as is usually the case for ir.rules changes.
This module has not made it into a LTS version yet, so it is acceptable.
+ Added a _description for the event.track model to avoid it being
replaced by inherited descriptions.