Author: olamy
Date: Wed Oct 31 07:36:28 2012
New Revision: 1404011
URL: http://svn.apache.org/viewvc?rev=1404011&view=rev
Log:
bootstrap 2.2.1
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/bootstrap.2.2.1.css
(contents, props changed)
- copied, changed from r1403926,
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/bootstrap.2.2.0.css
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/bootstrap.2.2.1.js
(contents, props changed)
- copied, changed from r1403926,
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/bootstrap.2.2.0.js
Removed:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/bootstrap.2.2.0.css
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/bootstrap.2.2.0.js
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js
Copied:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/bootstrap.2.2.1.css
(from r1403926,
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/bootstrap.2.2.0.css)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/bootstrap.2.2.1.css?p2=archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/bootstrap.2.2.1.css&p1=archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/bootstrap.2.2.0.css&r1=1403926&r2=1404011&rev=1404011&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/bootstrap.2.2.0.css
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/bootstrap.2.2.1.css
Wed Oct 31 07:36:28 2012
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v2.2.0
+ * Bootstrap v2.2.1
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/bootstrap.2.2.1.css
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/bootstrap.2.2.1.css
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html?rev=1404011&r1=1404010&r2=1404011&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
Wed Oct 31 07:36:28 2012
@@ -26,7 +26,7 @@
<link rel="stylesheet" href="css/jqueryFileTree.css"/>
<link rel="stylesheet" href="css/chosen-0.9.8.css"/>
<link rel="stylesheet" href="css/jquery-ui-1.8.16.custom.css"/>
- <link rel="stylesheet" href="css/bootstrap.2.2.0.css">
+ <link rel="stylesheet" href="css/bootstrap.2.2.1.css">
<link rel="stylesheet" href="css/archiva.css">
<link rel="shortcut icon" href="favicon.ico"/>
<link rel="stylesheet" href="css/prettify.css"/>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js?rev=1404011&r1=1404010&r2=1404011&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js
Wed Oct 31 07:36:28 2012
@@ -65,7 +65,7 @@ $.ajax({
"jquery.ui": "jquery-ui-1.8.23.custom.min",
"jquery.ui.widget": "jquery.ui.widget-1.8.18",
"jquery.cookie": "jquery.cookie.1.0.0",
- "bootstrap": "bootstrap.2.2.0",
+ "bootstrap": "bootstrap.2.2.1",
"choosen": "chosen.jquery-0.9.8",
"jquery.validate": "jquery.validate-1.9.0",
"jquery.json": "jquery.json-2.3.min",
Copied:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/bootstrap.2.2.1.js
(from r1403926,
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/bootstrap.2.2.0.js)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/bootstrap.2.2.1.js?p2=archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/bootstrap.2.2.1.js&p1=archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/bootstrap.2.2.0.js&r1=1403926&r2=1404011&rev=1404011&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/bootstrap.2.2.0.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/bootstrap.2.2.1.js
Wed Oct 31 07:36:28 2012
@@ -1,5 +1,5 @@
/* ===================================================
- * bootstrap-transition.js v2.2.0
+ * bootstrap-transition.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.
@@ -58,7 +58,7 @@
})
}(window.jQuery);/* ==========================================================
- * bootstrap-alert.js v2.2.0
+ * bootstrap-alert.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
@@ -145,7 +145,7 @@
$(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
}(window.jQuery);/*
============================================================
- * bootstrap-button.js v2.2.0
+ * bootstrap-button.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
@@ -238,7 +238,7 @@
})
}(window.jQuery);/* ==========================================================
- * bootstrap-carousel.js v2.2.0
+ * bootstrap-carousel.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
@@ -407,13 +407,13 @@
$(document).on('click.carousel.data-api', '[data-slide]', function (e) {
var $this = $(this), href
, $target = $($this.attr('data-target') || (href = $this.attr('href'))
&& href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
- , options = !$target.data('carousel') && $.extend({}, $target.data(),
$this.data())
+ , options = $.extend({}, $target.data(), $this.data())
$target.carousel(options)
e.preventDefault()
})
}(window.jQuery);/*
=============================================================
- * bootstrap-collapse.js v2.2.0
+ * bootstrap-collapse.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
@@ -568,7 +568,7 @@
})
}(window.jQuery);/*
============================================================
- * bootstrap-dropdown.js v2.2.0
+ * bootstrap-dropdown.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
@@ -715,7 +715,7 @@
.on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ',
[role=menu]' , Dropdown.prototype.keydown)
}(window.jQuery);/* =========================================================
- * bootstrap-modal.js v2.2.0
+ * bootstrap-modal.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
@@ -949,7 +949,7 @@
}(window.jQuery);
/* ===========================================================
- * bootstrap-tooltip.js v2.2.0
+ * bootstrap-tooltip.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
@@ -1224,7 +1224,7 @@
}
}(window.jQuery);/* ===========================================================
- * bootstrap-popover.js v2.2.0
+ * bootstrap-popover.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.
@@ -1326,7 +1326,7 @@
})
}(window.jQuery);/*
=============================================================
- * bootstrap-scrollspy.js v2.2.0
+ * bootstrap-scrollspy.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.
@@ -1476,7 +1476,7 @@
})
}(window.jQuery);/* ========================================================
- * bootstrap-tab.js v2.2.0
+ * bootstrap-tab.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.
@@ -1608,7 +1608,7 @@
})
}(window.jQuery);/*
=============================================================
- * bootstrap-typeahead.js v2.2.0
+ * bootstrap-typeahead.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.
@@ -1918,7 +1918,7 @@
}(window.jQuery);
/* ==========================================================
- * bootstrap-affix.js v2.2.0
+ * bootstrap-affix.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#affix
* ==========================================================
* Copyright 2012 Twitter, Inc.
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/bootstrap.2.2.1.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/bootstrap.2.2.1.js
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
