Merge branch 'master' into devel

This commit is contained in:
Sebastien 2018-12-02 16:19:23 +02:00
commit ca068d49e8
2 changed files with 2 additions and 1 deletions

View File

@ -2,6 +2,7 @@
var hash = window.location.hash.replace("#","").split("&"); var hash = window.location.hash.replace("#","").split("&");
var discordToken = ""; var discordToken = "";
debugger;
hash.forEach(function (value) { hash.forEach(function (value) {
if(value.indexOf("access_token") !== -1){ if(value.indexOf("access_token") !== -1){

View File

@ -55,10 +55,10 @@
<!-- Scripts--> <!-- Scripts-->
<script th:src="@{/js/jquery-3.3.1.min.js}"></script> <script th:src="@{/js/jquery-3.3.1.min.js}"></script>
<script th:src="@{/js/oauthCallback.js}"></script>
<script th:src="@{/js/materialize.js}"></script> <script th:src="@{/js/materialize.js}"></script>
<script th:src="@{/js/navabar.js}"></script> <script th:src="@{/js/navabar.js}"></script>
<script th:src="@{/js/js.cookie.js}"></script> <script th:src="@{/js/js.cookie.js}"></script>
<script th:src="@{/js/oauthCallback.js}"></script>
<script th:src="@{/js/fontawesome.js}"></script> <script th:src="@{/js/fontawesome.js}"></script>