Viewing all changes in revision 3709.
- Committer: Amit Bhavsar(Open ERP)
- Date: 2014-02-10 10:20:11 UTC
- mfrom: (3688.1.245 trunk)
- Revision ID: amb@tinyerp.com-20140210102011-8oy5cjg4l24sg1vl
[MERGE] merge with latest trunk.
- files added:
- addons/web/i18n/es_PE.po
- addons/web/static/lib/bootstrap
- addons/web/static/lib/bootstrap/css
- addons/web/static/lib/bootstrap/js
- 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
- files removed:
- 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/__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/fontawesome/fonts/fontawesome-webfont.svg
addons/web/static/lib/select2/select2.png
addons/web/static/lib/select2/select2x2.png
addons/web/static/lib/select2/spinner.gif
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/but_repeat.gif
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/buttons.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/calendar.gif
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/clock_big.gif
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/clock_small.gif
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/collapse_expand_icon.gif
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/controls.gif
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/databg.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/databg_now.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/icon.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/images.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/loading.gif
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/resize_dots.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_dhx_terrace/arrow_left.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_dhx_terrace/arrow_right.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_dhx_terrace/but_repeat.gif
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_dhx_terrace/calendar.gif
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_dhx_terrace/clock_big.gif
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_dhx_terrace/clock_small.gif
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_dhx_terrace/close_icon.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_dhx_terrace/collapse_expand_icon.gif
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_dhx_terrace/controls.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_dhx_terrace/databg.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_dhx_terrace/databg_now.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_dhx_terrace/resize_dots.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_dhx_terrace/resizing.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/blue_tab.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/blue_tab_wide.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/but_repeat.gif
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/buttons.gif
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/calendar.gif
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/clock_big.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/clock_small.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/collapse_expand_icon.gif
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/controlls5.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/databg.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/databg_now.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/event-bg.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/icon.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/left-separator.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/left-time-bg.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/lightbox.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/loading.gif
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/move.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/multi-days-bg.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/second-top-days-bg.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/top-days-bg.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/top-separator.gif
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/white_tab.png
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs_glossy/white_tab_wide.png
addons/web_calendar/static/src/img/cal_left.png
addons/web_calendar/static/src/img/cal_right.png
addons/web_calendar/static/src/img/minical_left.png
addons/web_calendar/static/src/img/minical_right.png
addons/web_graph/static/lib/flotr2/lib/jasmine/jasmine_favicon.png
