Viewing all changes in revision 3910.39.7.
- Committer: Gery Debongnie
- Date: 2014-05-02 12:33:55 UTC
- mfrom: (3910.1.92 trunk)
- mto: (3910.1.93 web)
- mto: This revision was merged to the branch mainline in revision 3944.
- Revision ID: ged@openerp.com-20140502123355-9dqpwq1g9rrpisxj
[MERGE] merge from trunk
- files added:
- addons/web_calendar/views
- addons/web_diagram/views
- addons/web_gantt/views
- addons/web_graph/views
- addons/web_kanban/views
- addons/web_kanban_gauge/views
- addons/web_kanban_sparkline/views
- addons/web_tests/tests
- addons/web_tests/views
- addons/web_tests_demo/views
- addons/web_view_editor/views
- files removed:
- addons/web/controllers/testing.py
- addons/web/static/lib/jquery.tipsy
- addons/web/tests/qunitsuite
- addons/web/tests/qunitsuite/grunt
- addons/web_hello/static
- addons/web_hello/static/openerp
- addons/web_tests_demo/tests
- files renamed:
- addons/web/tests/test_ui.py => addons/web_tests/tests/test_ui.py
- addons/web/tests/test_ui_hello.js => addons/web_tests/tests/test_ui_hello.js
- addons/web/tests/test_ui_load.js => addons/web_tests/tests/test_ui_load.js
- files modified:
- addons/web/__openerp__.py
expand all
collapse all
added
removed
