提交 8e9f400f 编写于 作者: R rsercano

trying to fix #523

上级 efe3fb8a
......@@ -199,17 +199,17 @@
</div>
{{/if}}
{{else}}
<div class="wrapper wrapper-content animated fadeInRight">
<div class="row">
<div class="col-lg-12">
<div class="text-center m-t-lg">
<h1>
<img width="300" height="200" src="logo/new/image_with_text2.png"/>
</h1>
<div class="wrapper wrapper-content animated fadeInRight">
<div class="row">
<div class="col-lg-12">
<div class="text-center m-t-lg">
<h1>
<img width="300" height="200" src="logo/new/image_with_text2.png"/>
</h1>
</div>
</div>
</div>
</div>
<div class="row">
<!--<div class="row">
<div class="col-lg-6 col-lg-offset-3">
<div class="text-center m-t-lg">
<div class="panel panel-primary">
......@@ -228,39 +228,18 @@
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<div class="text-center m-t-lg">
{{#if isSubscribed}}
</div>-->
<div class="row">
<div class="col-lg-12">
<div class="text-center m-t-lg">
<small>
{{{_ "connect_info"}}}
{{{_ "use_our_github"}}}<br/>
{{{_ "github_link"}}}
</small>
<br/>
<br/>
<button type="button" class="btn btn-primary ladda-button" disabled
data-style="contract">{{_ "thanks-for-subscription"}}
</button>
{{else}}
<small>
{{{_ "subscribe_info"}}}
</small>
<div class="row">
<div class="col-lg-offset-4 col-lg-4">
<input id="txtEmailToSubscribe" type="email"
placeholder="{{_ "email_we_hate_spam"}}"
class="form-control required"/>
</div>
</div>
<br/>
<button id="btnSubscribe" type="button" class="btn btn-primary ladda-button"
data-style="contract">{{_ "subscribe"}}
</button>
{{/if}}
</div>
</div>
</div>
</div>
</div>
{{/if}}
{{/if}}
......
......@@ -424,6 +424,8 @@
"stats_disabled":"Statistics are disabled",
"stats_info":" To see the statistics of your database, simply <strong>enable</strong> <i>show database statistics</i> setting",
"connect_info":"Connect to your database, by clicking <b>Connect</b> button",
"use_our_github": "Use our github project for <b>bug reports, feature requests</b>",
"github_link": "https://github.com/nosqlclient/nosqlclient",
"subscribe_info":"Subscribe to Nosqlclient Newsletter by filling your e-mail address to below input, and pressing <b>Subscribe</b>",
"email_we_hate_spam":"E-mail, don't worry we hate spam !",
"subscribe":"Subscribe",
......
......@@ -426,6 +426,8 @@
"stats_info":"İstatistikleri görmek istiyorsanız, <i>veritabanı istatistiklerini göster</i> ayarını ayarlardan açabilirsin",
"connect_info":"Bağlanmak için <b>Bağlan</b> butonunu kullan",
"subscribe_info":"Abone olmak için e-mail adresini gir, ve <b>Abone Ol</b> butonunu kullan",
"use_our_github": "Github projemizi kullanarak <b>bug raporlayabilir, yeni bir özellik isteyebilirsiniz</b>",
"github_link": "https://github.com/nosqlclient/nosqlclient",
"email_we_hate_spam":"E-mail, merak etme SPAM'i kimse sevmez !",
"subscribe":"Abone Ol",
"dont_show_again":"Süper, tekrar gösterme",
......
......@@ -2698,9 +2698,9 @@
"integrity": "sha512-3IE39bHVqFbWWaPOMHZF98Q9c3LDKGTmypMiTM2QygGXXElkFWIH7GxfmlwmY2vwa+wmNsoYZmG2iusf1ZjJoA=="
},
"mongodb": {
"version": "3.5.7",
"resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.5.7.tgz",
"integrity": "sha512-lMtleRT+vIgY/JhhTn1nyGwnSMmJkJELp+4ZbrjctrnBxuLbj6rmLuJFz8W2xUzUqWmqoyVxJLYuC58ZKpcTYQ==",
"version": "3.5.8",
"resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.5.8.tgz",
"integrity": "sha512-jz7mR58z66JKL8Px4ZY+FXbgB7d0a0hEGCT7kw8iye46/gsqPrOEpZOswwJ2BQlfzsrCLKdsF9UcaUfGVN2HrQ==",
"requires": {
"bl": "^2.2.0",
"bson": "^1.1.4",
......
......@@ -362,7 +362,7 @@ Connection.prototype = {
},
getConnectionOptions(connection) {
const result = { useNewUrlParser: true };
const result = { useNewUrlParser: true, useUnifiedTopology: true };
if (connection.authenticationType === 'mongodb_x509') addSSLOptions(connection.mongodb_x509, result);
if (connection.ssl && connection.ssl.enabled) addSSLOptions(connection.ssl, result);
if (connection.options && connection.options.connectWithNoPrimary) result.connectWithNoPrimary = true;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册