sebclem/ClaptrapBot
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'master' into devel

Browse Source
This commit is contained in:
Sebastien 2018-04-25 11:08:48 +02:00
commit 87aa1edde4
6 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/Broken/Init.java
View File

@ -112,7 +112,7 @@ public class Init {
static void polish(JDA jda){ static void polish(JDA jda){
CommandLoader.load(); CommandLoader.load();
ApiCommandLoader.load(); ApiCommandLoader.load();
jda.getPresence().setGame(Game.of("Statut: Ok!")); jda.getPresence().setGame(Game.of("bot.seb6596.ovh"));
} }
} }

4
src/main/resources/templates/index.html
View File

@ -124,9 +124,7 @@
</div> </div>
<!-- Scripts--> <!-- Scripts-->
<script src="https://code.jquery.com/jquery-3.3.1.js" <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
integrity="sha256-2Kok7MbOyxpgUVvAk/HJ2jigOSYS2auK4Pfzbm7uH60="
crossorigin="anonymous"></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>

4
src/main/resources/templates/loading.html
View File

@ -67,9 +67,7 @@
</div> </div>
<!-- Scripts--> <!-- Scripts-->
<script src="https://code.jquery.com/jquery-3.3.1.js" <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
integrity="sha256-2Kok7MbOyxpgUVvAk/HJ2jigOSYS2auK4Pfzbm7uH60="
crossorigin="anonymous"></script>
<script th:src="@{/js/materialize.js}"></script> <script th:src="@{/js/materialize.js}"></script>
<script th:src="@{/js/loading.js}"></script> <script th:src="@{/js/loading.js}"></script>

4
src/main/resources/templates/music.html
View File

@ -371,9 +371,7 @@
</p> </p>
<!-- Scripts--> <!-- Scripts-->
<script src="https://code.jquery.com/jquery-3.3.1.js" <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
integrity="sha256-2Kok7MbOyxpgUVvAk/HJ2jigOSYS2auK4Pfzbm7uH60="
crossorigin="anonymous"></script>
<script> <script>
var needLogin = true; var needLogin = true;

4
src/main/resources/templates/register.html
View File

@ -191,9 +191,7 @@
<script src="https://code.jquery.com/jquery-3.3.1.js" <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
integrity="sha256-2Kok7MbOyxpgUVvAk/HJ2jigOSYS2auK4Pfzbm7uH60="
crossorigin="anonymous"></script>
<script th:src="@{/js/materialize.js}"></script> <script th:src="@{/js/materialize.js}"></script>
<script th:src="@{/js/register.js}"></script> <script th:src="@{/js/register.js}"></script>
<script th:src="@{/js/navabar.js}"></script> <script th:src="@{/js/navabar.js}"></script>

4
src/main/resources/templates/youtubeCallBack.html
View File

@ -129,9 +129,7 @@
</div> </div>
<!-- Scripts--> <!-- Scripts-->
<script src="https://code.jquery.com/jquery-3.3.1.js" <script src="https://code.jquery.com/jquery-3.3.1.js"></script>
integrity="sha256-2Kok7MbOyxpgUVvAk/HJ2jigOSYS2auK4Pfzbm7uH60="
crossorigin="anonymous"></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>