Skip to content

various bug fixes #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Beyley wants to merge 9 commits into
base: master
Choose a base branch
from
Open

various bug fixes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
03eabe8
Fix 2FA Password character limit
Beyley Jul 17, 2019
6ba0c7a
Fix 2FA Password character limit
Beyley Jul 17, 2019
4626485
Fix "Change password" field character limit
Beyley Jul 17, 2019
936c4a5
Fix "Change password" field character limit
Beyley Jul 17, 2019
59d0feb
Add conveniance links to contact page
Beyley Jul 17, 2019
d537cee
Add conveniance links to contact page
Beyley Jul 17, 2019
17d5e64
Remove nicescroll
Beyley Jul 17, 2019
b3fd343
Remove nicescroll
Beyley Jul 17, 2019
d383c5e
Remove nicescroll
Beyley Jul 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion dappur/base.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@

<script src="https://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.2.1.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.nicescroll/3.7.5/jquery.nicescroll.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/limonte-sweetalert2/6.6.6/sweetalert2.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/cookieconsent2/3.1.0/cookieconsent.min.js"></script>

Expand Down
8 changes: 4 additions & 4 deletions dappur/contact.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@
</div>
<div class="info">
<h3 class="title">ONLINE</h3>
<p><i aria-hidden="true" class="fa fa-envelope"></i> &nbsp; {{config['contact-email']}}<br>
<p><i aria-hidden="true" class="fa fa-envelope"></i> &nbsp;<a href='mailto: {{config['contact-email']}}'>{{config['contact-email']}}</a><br>
<br>
<i aria-hidden="true" class="fa fa-globe"></i> &nbsp; {{config['domain']}}</p>
<i aria-hidden="true" class="fa fa-globe"></i> &nbsp;<a href='https://{{config['domain']}}'>{{config['domain']}}</a></p>
</div>
</div>
<div class="space"></div>
Expand All @@ -81,7 +81,7 @@
</div>
<div class="info">
<h3 class="title">PHONE</h3>
<p><i aria-hidden="true" class="fa fa-phone"></i> &nbsp; {{config['contact-phone']}}<br></p>
<p><i aria-hidden="true" class="fa fa-phone"></i> &nbsp; <a href='tel: +{{config['contact-phone']}}'>{{config['contact-phone']}}</a><br></p>
</div>
</div>
<div class="space"></div>
Expand Down Expand Up @@ -115,4 +115,4 @@

{% block javascript %}
{% if config['recaptcha-enabled'] %}{{ recaptchaJs() }}{% endif %}
{% endblock %}
{% endblock %}
3 changes: 1 addition & 2 deletions dappur/js/2fa.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ $(document).on('change', '#2fa', function(){
text: "Please enter your current password to continue. If you do not know your current password, logout and click 'Forgot Password' on the login page.",
input: 'password',
inputAttributes: {
'maxlength': 10,
'autocapitalize': 'off',
'autocorrect': 'off'
},
Expand Down Expand Up @@ -99,4 +98,4 @@ $(document).on('change', '#2fa', function(){
$('#2fa-toggle').html('<input type="checkbox" '+checkedText+' data-toggle="toggle" data-on="Enabled" data-off="Disabled" data-onstyle="success" data-offstyle="danger" height="" id="2fa">');
$('#2fa').bootstrapToggle();
}).catch(swal.noop);
});
});
2 changes: 1 addition & 1 deletion dappur/js/2fa.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions dappur/js/change-password.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ $(document).on('click', '.change_password', function(){
text: "Please enter your current password to continue. If you do not know your current password, logout and click 'Forgot Password' on the login page.",
input: 'password',
inputAttributes: {
'maxlength': 10,
'autocapitalize': 'off',
'autocorrect': 'off'
},
Expand Down Expand Up @@ -84,4 +83,4 @@ $(document).on('click', '.change_password', function(){
})
}).catch(swal.noop);
}).catch(swal.noop);
});
});
2 changes: 1 addition & 1 deletion dappur/js/change-password.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions dappur/js/custom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
$(document).ready(function(){
/* Nice Scroll
-------------------------------------------------- */
$("body").niceScroll();

/* Initialize Labels
-------------------------------------------------- */
Expand Down Expand Up @@ -40,4 +37,4 @@ window.cookieconsent.initialise({
"border": "#56cbdb"
}
}
})});
})});
2 changes: 1 addition & 1 deletion dappur/js/custom.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.