[MERGE] merge trunk

bzr revid: ged@openerp.com-20131212095350-hfn21bwp031nns1m
2013-12-12 10:53:50 +01:00 · 2013-12-12 10:53:50 +01:00 · d27b9ab563
parent edbc4d8927 43627cc63a
commit d27b9ab563
4 changed files with 1 additions and 3553 deletions
--- a/addons/web/openerp.py
+++ b/addons/web/openerp.py
@ -36,6 +36,7 @@ This module provides the core of the OpenERP Web Client.
        "static/lib/jquery.tipsy/jquery.tipsy.js",
        "static/lib/jquery.textext/jquery.textext.js",
        "static/lib/jquery.timeago/jquery.timeago.js",
+        "static/lib/bootstrap/js/bootstrap.js",
        "static/lib/qweb/qweb2.js",
        "static/lib/underscore/underscore.js",
        "static/lib/underscore.string/lib/underscore.string.js",
--- a/addons/web_graph/openerp.py
+++ b/addons/web_graph/openerp.py
@ -17,7 +17,6 @@ Graph Views for Web Client.
    'js': [
        'static/lib/nvd3/d3.v3.js',
        'static/lib/nvd3/nv.d3.js',
-        'static/lib/bootstrap/bootstrap.js',
        'static/src/js/graph.js',
        'static/src/js/pivot.js',
        'static/src/js/charts.js',
--- a/addons/web_graph/static/lib/bootstrap/bootstrap.js
+++ b/addons/web_graph/static/lib/bootstrap/bootstrap.js
--- a/addons/web_graph/static/src/css/bootstrap.css
+++ b/addons/web_graph/static/src/css/bootstrap.css