« back to all changes in this revision
Viewing changes to addons/web/static/lib/ckeditor/plugins/iframe/
- Committer: Turkesh Patel (Open ERP)
- Date: 2014-03-06 06:44:30 UTC
- mfrom: (3840.1.111 openerp-web)
- Revision ID: tpa@tinyerp.com-20140306064430-mo911iyioohr1tnb
[MRG] merge sith lp:openerp-web
- files added:
- addons/web/i18n/es_PE.po
- addons/web/static/lib/bootstrap
- addons/web/static/lib/bootstrap/css
- addons/web/static/lib/bootstrap/fonts
- addons/web/static/lib/bootstrap/fonts/bootstrap
- addons/web/static/lib/bootstrap/javascripts
- addons/web/static/lib/bootstrap/javascripts/bootstrap
- addons/web/static/lib/bootstrap/js
- addons/web/static/lib/bootstrap/stylesheets
- addons/web/static/lib/bootstrap/stylesheets/bootstrap
- 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_calendar/static/lib/fullcalendar
- addons/web_calendar/static/lib/fullcalendar/css
- addons/web_calendar/static/lib/fullcalendar/js
- addons/web_graph/controllers
- addons/web_graph/static/lib/nvd3
- addons/web_tests_demo/tests
- files removed:
- addons/web/http.py
- addons/web/static/lib/jquery.MD5
- addons/web/static/lib/jquery.MD5/tests
- addons/web_calendar/static/lib/dhtmlxScheduler
- addons/web_calendar/static/lib/dhtmlxScheduler/codebase
- addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs
- addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_dhx_terrace
- addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy
- addons/web_calendar/static/lib/dhtmlxScheduler/sources
- addons/web_calendar/static/lib/dhtmlxScheduler/sources/ext
- addons/web_calendar/static/src/img
- 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 renamed:
- addons/web/static/lib/fontawesome/font/ => addons/web/static/lib/fontawesome/fonts/
- addons/web_calendar/static/src/css/web_calendar.css => addons/web_calendar/static/src/css/web_fullcalendar.css
- addons/web_calendar/static/src/css/web_calendar.sass => addons/web_calendar/static/src/css/web_fullcalendar.sass
- addons/web_calendar/static/src/js/calendar.js => addons/web_calendar/static/src/js/web_calendar.js
- addons/web_calendar/static/src/xml/web_calendar.xml => addons/web_calendar/static/src/xml/web_fullcalendar.xml
- files modified:
- addons/web/__init__.py
added
removed
addons/web/static/lib/ckeditor/plugins/iframe/
