Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:OmniDB/OmniDB into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
rafaelthca committed Dec 16, 2020
2 parents 1e88ca5 + cdc7fe7 commit b965d4a
Show file tree
Hide file tree
Showing 3 changed files with 83 additions and 83 deletions.
12 changes: 6 additions & 6 deletions OmniDB/OmniDB_app/static/OmniDB_app/js/query.js
Original file line number Diff line number Diff line change
Expand Up @@ -473,17 +473,17 @@ function querySQLReturnRender(p_message,p_context) {
columns : columnProperties,
colHeaders : true,
rowHeaders : true,
stretchH: 'last',
// stretchH: 'last',
autoRowSize: false,
//copyRowsLimit : 1000000000,
//copyColsLimit : 1000000000,
copyPaste: {pasteMode: '', rowsLimit: 1000000000, columnsLimit: 1000000000},
manualColumnResize: true,
modifyColWidth: function(width, col){
if(width > 300){
return 280
}
},
// modifyColWidth: function(width, col){
// if(width > 300){
// return 280
// }
// },
fillHandle:false,
contextMenu: {
callback: function (key, options) {
Expand Down
16 changes: 8 additions & 8 deletions OmniDB/OmniDB_app/templates/OmniDB_app/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<meta name="viewport" content="width=device-width,initial-scale=1">
<link rel="shortcut icon" type="image/x-icon" href="{{url_folder}}/static/OmniDB_app/images/favicon.ico" />

<!-- <link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/new/css/login.css?v3.0.3b.9eac8f3d"/> -->
<link rel="stylesheet" href="{{url_folder}}/static/OmniDB_app/lib/bootstrap/bootstrap.min.css?v3.0.3b.9eac8f3d">
<link rel="stylesheet" href="{{url_folder}}/static/OmniDB_app/css/omnidb.min.css?v3.0.3b.9eac8f3d">
<link rel="stylesheet" href="{{url_folder}}/static/OmniDB_app/css/login.min.css?v3.0.3b.9eac8f3d">
<!-- <link rel="stylesheet" type="text/css" href="{{url_folder}}/static/OmniDB_app/new/css/login.css?v3.0.3b.8a9cf4d1"/> -->
<link rel="stylesheet" href="{{url_folder}}/static/OmniDB_app/lib/bootstrap/bootstrap.min.css?v3.0.3b.8a9cf4d1">
<link rel="stylesheet" href="{{url_folder}}/static/OmniDB_app/css/omnidb.min.css?v3.0.3b.8a9cf4d1">
<link rel="stylesheet" href="{{url_folder}}/static/OmniDB_app/css/login.min.css?v3.0.3b.8a9cf4d1">
</head>
<body class="omnidb--theme-light">

Expand Down Expand Up @@ -87,10 +87,10 @@
<!-- <div class="div_loading"><button id="bt_cancel_ajax" onclick="cancelAjax()">Cancel</button></div> -->

<!-- <script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/old_js/jquery-1.11.2.min.js"></script> -->
<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/lib/jquery/jquery.min.js?v3.0.3b.9eac8f3d"></script>
<script src="{{url_folder}}/static/OmniDB_app/lib/bootstrap/bootstrap.min.js?v3.0.3b.9eac8f3d"></script>
<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/notification_control.js?v3.0.3b.9eac8f3d"></script>
<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/ajax_control.js?v3.0.3b.9eac8f3d"></script>
<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/lib/jquery/jquery.min.js?v3.0.3b.8a9cf4d1"></script>
<script src="{{url_folder}}/static/OmniDB_app/lib/bootstrap/bootstrap.min.js?v3.0.3b.8a9cf4d1"></script>
<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/notification_control.js?v3.0.3b.8a9cf4d1"></script>
<script type="text/javascript" src="{{url_folder}}/static/OmniDB_app/js/ajax_control.js?v3.0.3b.8a9cf4d1"></script>
<script type="text/javascript">
var v_url_folder = '{{ url_folder }}';
var v_csrf_cookie_name = '{{ csrf_cookie_name }}';
Expand Down
Loading

0 comments on commit b965d4a

Please sign in to comment.