Viewing all changes in revision 3904.
- Committer: Kunal Chavda (Open ERP)
- Date: 2014-02-05 05:56:20 UTC
- mfrom: (3888.2.40 openerp-web)
- Revision ID: kch@tinyerp.com-20140205055620-edagev11tskov0bs
[MERGE]with latest and resolve conflicts.
- files added:
- addons/web/static/lib/ckeditor
- addons/web/static/lib/ckeditor/adapters
- addons/web/static/lib/ckeditor/lang
- addons/web/static/lib/ckeditor/plugins
- addons/web/static/lib/ckeditor/plugins/a11yhelp
- addons/web/static/lib/ckeditor/plugins/a11yhelp/dialogs
- addons/web/static/lib/ckeditor/plugins/a11yhelp/dialogs/lang
- addons/web/static/lib/ckeditor/plugins/clipboard
- addons/web/static/lib/ckeditor/plugins/clipboard/dialogs
- addons/web/static/lib/ckeditor/plugins/colordialog
- addons/web/static/lib/ckeditor/plugins/colordialog/dialogs
- addons/web/static/lib/ckeditor/plugins/dialog
- addons/web/static/lib/ckeditor/plugins/fakeobjects
- addons/web/static/lib/ckeditor/plugins/fakeobjects/images
- addons/web/static/lib/ckeditor/plugins/find
- addons/web/static/lib/ckeditor/plugins/find/dialogs
- addons/web/static/lib/ckeditor/plugins/iframe
- addons/web/static/lib/ckeditor/plugins/iframe/dialogs
- addons/web/static/lib/ckeditor/plugins/iframe/images
- addons/web/static/lib/ckeditor/plugins/image
- addons/web/static/lib/ckeditor/plugins/image/dialogs
- addons/web/static/lib/ckeditor/plugins/image/images
- addons/web/static/lib/ckeditor/plugins/link
- addons/web/static/lib/ckeditor/plugins/link/dialogs
- addons/web/static/lib/ckeditor/plugins/link/images
- addons/web/static/lib/ckeditor/plugins/link/images/hidpi
- addons/web/static/lib/ckeditor/plugins/pastefromword
- addons/web/static/lib/ckeditor/plugins/pastefromword/filter
- addons/web/static/lib/ckeditor/plugins/preview
- addons/web/static/lib/ckeditor/plugins/table
- addons/web/static/lib/ckeditor/plugins/table/dialogs
- addons/web/static/lib/ckeditor/plugins/templates
- addons/web/static/lib/ckeditor/plugins/templates/dialogs
- addons/web/static/lib/ckeditor/plugins/templates/templates
- addons/web/static/lib/ckeditor/plugins/templates/templates/images
- addons/web/static/lib/ckeditor/plugins/widget
- addons/web/static/lib/ckeditor/plugins/widget/images
- addons/web/static/lib/ckeditor/samples
- addons/web/static/lib/ckeditor/samples/assets
- addons/web/static/lib/ckeditor/samples/assets/inlineall
- addons/web/static/lib/ckeditor/samples/assets/outputxhtml
- addons/web/static/lib/ckeditor/samples/assets/uilanguages
- addons/web/static/lib/ckeditor/samples/plugins
- addons/web/static/lib/ckeditor/samples/plugins/dialog
- addons/web/static/lib/ckeditor/samples/plugins/dialog/assets
- addons/web/static/lib/ckeditor/samples/plugins/enterkey
- addons/web/static/lib/ckeditor/samples/plugins/htmlwriter
- addons/web/static/lib/ckeditor/samples/plugins/htmlwriter/assets
- addons/web/static/lib/ckeditor/samples/plugins/htmlwriter/assets/outputforflash
- addons/web/static/lib/ckeditor/samples/plugins/sharedspace
- addons/web/static/lib/ckeditor/samples/plugins/toolbar
- addons/web/static/lib/ckeditor/samples/plugins/wysiwygarea
- addons/web/static/lib/ckeditor/skins
- addons/web/static/lib/ckeditor/skins/moono
- addons/web/static/lib/ckeditor/skins/moono/images
- addons/web/static/lib/ckeditor/skins/moono/images/hidpi
- addons/web/static/lib/select2
- addons/web/views
- addons/web_graph/static/lib/nvd3
- files removed:
- addons/web/static/lib/ckeditor
- addons/web/static/lib/ckeditor/adapters
- addons/web/static/lib/ckeditor/lang
- addons/web/static/lib/ckeditor/plugins
- addons/web/static/lib/ckeditor/plugins/a11yhelp
- addons/web/static/lib/ckeditor/plugins/a11yhelp/dialogs
- addons/web/static/lib/ckeditor/plugins/a11yhelp/dialogs/lang
- addons/web/static/lib/ckeditor/plugins/clipboard
- addons/web/static/lib/ckeditor/plugins/clipboard/dialogs
- addons/web/static/lib/ckeditor/plugins/colordialog
- addons/web/static/lib/ckeditor/plugins/colordialog/dialogs
- addons/web/static/lib/ckeditor/plugins/dialog
- addons/web/static/lib/ckeditor/plugins/fakeobjects
- addons/web/static/lib/ckeditor/plugins/fakeobjects/images
- addons/web/static/lib/ckeditor/plugins/find
- addons/web/static/lib/ckeditor/plugins/find/dialogs
- addons/web/static/lib/ckeditor/plugins/iframe
- addons/web/static/lib/ckeditor/plugins/iframe/dialogs
- addons/web/static/lib/ckeditor/plugins/iframe/images
- addons/web/static/lib/ckeditor/plugins/image
- addons/web/static/lib/ckeditor/plugins/image/dialogs
- addons/web/static/lib/ckeditor/plugins/image/images
- addons/web/static/lib/ckeditor/plugins/link
- addons/web/static/lib/ckeditor/plugins/link/dialogs
- addons/web/static/lib/ckeditor/plugins/link/images
- addons/web/static/lib/ckeditor/plugins/link/images/hidpi
- addons/web/static/lib/ckeditor/plugins/pastefromword
- addons/web/static/lib/ckeditor/plugins/pastefromword/filter
- addons/web/static/lib/ckeditor/plugins/preview
- addons/web/static/lib/ckeditor/plugins/table
- addons/web/static/lib/ckeditor/plugins/table/dialogs
- addons/web/static/lib/ckeditor/plugins/templates
- addons/web/static/lib/ckeditor/plugins/templates/dialogs
- addons/web/static/lib/ckeditor/plugins/templates/templates
- addons/web/static/lib/ckeditor/plugins/templates/templates/images
- addons/web/static/lib/ckeditor/plugins/widget
- addons/web/static/lib/ckeditor/plugins/widget/images
- addons/web/static/lib/ckeditor/samples
- addons/web/static/lib/ckeditor/samples/assets
- addons/web/static/lib/ckeditor/samples/assets/inlineall
- addons/web/static/lib/ckeditor/samples/assets/outputxhtml
- addons/web/static/lib/ckeditor/samples/assets/uilanguages
- addons/web/static/lib/ckeditor/samples/plugins
- addons/web/static/lib/ckeditor/samples/plugins/dialog
- addons/web/static/lib/ckeditor/samples/plugins/dialog/assets
- addons/web/static/lib/ckeditor/samples/plugins/enterkey
- addons/web/static/lib/ckeditor/samples/plugins/htmlwriter
- addons/web/static/lib/ckeditor/samples/plugins/htmlwriter/assets
- addons/web/static/lib/ckeditor/samples/plugins/htmlwriter/assets/outputforflash
- addons/web/static/lib/ckeditor/samples/plugins/sharedspace
- addons/web/static/lib/ckeditor/samples/plugins/toolbar
- addons/web/static/lib/ckeditor/samples/plugins/wysiwygarea
- addons/web/static/lib/ckeditor/skins
- addons/web/static/lib/ckeditor/skins/moono
- addons/web/static/lib/ckeditor/skins/moono/images
- addons/web/static/lib/ckeditor/skins/moono/images/hidpi
- addons/web_graph/static/lib/flotr2
- addons/web_graph/static/lib/flotr2/dev
- addons/web_graph/static/lib/flotr2/js
- addons/web_graph/static/lib/flotr2/js/plugins
- addons/web_graph/static/lib/flotr2/js/types
- addons/web_graph/static/lib/flotr2/lib
- addons/web_graph/static/lib/flotr2/lib/jasmine
- files modified:
- addons/web/__openerp__.py
expand all
collapse all
added
removed
addons/web/static/lib/ckeditor/plugins/fakeobjects/images/spacer.gif
addons/web/static/lib/ckeditor/plugins/icons.png
addons/web/static/lib/ckeditor/plugins/icons_hidpi.png
addons/web/static/lib/ckeditor/plugins/iframe/images/placeholder.png
addons/web/static/lib/ckeditor/plugins/image/images/noimage.png
addons/web/static/lib/ckeditor/plugins/link/images/anchor.png
addons/web/static/lib/ckeditor/plugins/link/images/hidpi/anchor.png
addons/web/static/lib/ckeditor/plugins/templates/templates/images/template1.gif
addons/web/static/lib/ckeditor/plugins/templates/templates/images/template2.gif
addons/web/static/lib/ckeditor/plugins/templates/templates/images/template3.gif
addons/web/static/lib/ckeditor/plugins/widget/images/handle.png
addons/web/static/lib/ckeditor/samples/assets/inlineall/logo.png
addons/web/static/lib/ckeditor/samples/assets/sample.jpg
addons/web/static/lib/ckeditor/skins/moono/icons.png
addons/web/static/lib/ckeditor/skins/moono/icons_hidpi.png
addons/web/static/lib/ckeditor/skins/moono/images/arrow.png
addons/web/static/lib/ckeditor/skins/moono/images/close.png
addons/web/static/lib/ckeditor/skins/moono/images/hidpi/close.png
addons/web/static/lib/ckeditor/skins/moono/images/hidpi/lock-open.png
addons/web/static/lib/ckeditor/skins/moono/images/hidpi/lock.png
addons/web/static/lib/ckeditor/skins/moono/images/hidpi/refresh.png
addons/web/static/lib/ckeditor/skins/moono/images/lock-open.png
addons/web/static/lib/ckeditor/skins/moono/images/lock.png
addons/web/static/lib/ckeditor/skins/moono/images/refresh.png
addons/web/static/lib/select2/select2.png
addons/web/static/lib/select2/select2x2.png
addons/web/static/lib/select2/spinner.gif
addons/web_graph/static/lib/flotr2/lib/jasmine/jasmine_favicon.png
