Viewing all changes in revision 3876.
- Committer: Dharmraj Jhala(OpenERP)
- Date: 2014-01-30 07:16:34 UTC
- mfrom: (3867.1.53 origin/trunk)
- Revision ID: dizzy.zala@gmail.com-20140130071634-w0945efb5tve39nl
[MERGE] with trunk
- files added:
- addons/web/i18n/es_PE.po
- addons/web_calendar/static/lib/fullcalendar
- addons/web_calendar/static/lib/fullcalendar/css
- addons/web_calendar/static/lib/fullcalendar/js
- addons/web_graph/static/lib/nvd3
- files removed:
- addons/web/tests/test_dataset.py
- 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_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_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
