coba merging

.gitignore

@@ -5,7 +5,7 @@ __pycache__/
 
 
 # C extensions
 # C extensions
 *.so
 *.so
-
+*.jasper
 # Distribution / packaging
 # Distribution / packaging
 .Python
 .Python
 bak/
 bak/

opensipkd/base/static/v3/js/osipkd.js

@@ -32,6 +32,16 @@ $(document).ready(function () {
      */
      */
 });
 });
 
 
+jQuery.browser = {};
+(function () {
+    jQuery.browser.msie = false;
+    jQuery.browser.version = 0;
+    if (navigator.userAgent.match(/MSIE ([0-9]+)\./)) {
+        jQuery.browser.msie = true;
+        jQuery.browser.version = RegExp.$1;
+    }
+})();
+
 function number_format(number, decimals, dec_point, thousands_sep) {
 function number_format(number, decimals, dec_point, thousands_sep) {
     // Strip all characters but numerical ones.
     // Strip all characters but numerical ones.
     number = (number + '').replace(/[^0-9+\-Ee.]/g, '');
     number = (number + '').replace(/[^0-9+\-Ee.]/g, '');