Commit Graph

155 Commits

Author SHA1 Message Date
3522e31481 Merge remote-tracking branch 'origin/master' into devel 2018-02-16 14:18:46 +01:00
bfd1203536 Adding versioning for js files 2018-02-16 14:18:28 +01:00
ddcb8d18a9 Update readme 2018-02-15 23:21:39 +01:00
bf3e1c948e Update readme 2018-02-15 23:13:54 +01:00
eff8cbccf2 Update docker-compose 2018-02-15 23:11:43 +01:00
04fe7b5588 Update docker-compose 2018-02-15 23:08:12 +01:00
7132b36472
Remove max mem 2018-02-15 21:59:50 +01:00
804ab691bd Merge branch 'devel' 2018-02-15 02:05:00 +01:00
969159a525 Revert "Merge remote-tracking branch 'origin/devel' into devel"
This reverts commit dde5a98698.
2018-02-15 02:03:05 +01:00
dde5a98698 Merge remote-tracking branch 'origin/devel' into devel 2018-02-15 02:02:35 +01:00
5171d07785 Revert "Revert "Merge branch 'devel' into origin/master""
This reverts commit 5e5419d2be.
2018-02-15 02:02:19 +01:00
84e1a9d7d9 Merge branch 'devel' 2018-02-15 01:00:33 +01:00
b662935be9 update readMe 2018-02-15 00:59:02 +01:00
5e5419d2be Revert "Merge branch 'devel' into origin/master"
This reverts commit 34ce297e7c1ff524cb39ee97e415cd53f624a94d.
2018-02-15 00:57:32 +01:00
5eac91aada Account confirmation now return name 2018-02-15 00:27:56 +01:00
9dd946750d Correct undifined error 2018-02-14 21:51:21 +01:00
b07fd7f204 Redirect after register 2018-02-14 21:41:09 +01:00
188bc57b1b Correct scale-out on register modal 2018-02-14 21:36:01 +01:00
234a215e21 UTF-8 ...... 2018-02-14 20:35:45 +01:00
9b522318e9 Correct resource can't load from jar 2018-02-14 20:16:24 +01:00
5e350ad89d - 2018-02-14 19:38:49 +01:00
f9de6ce1ac remove max memory 2018-02-14 18:53:56 +01:00
320803a347 change max JVM memory 2018-02-14 18:37:56 +01:00
2f4a062a29 Fix max JVM memory 2018-02-14 15:09:02 +01:00
0287fc976e Adding favicon 2018-02-14 14:47:57 +01:00
b79f809094 Adding DB settings 2018-02-14 12:53:46 +01:00
fe139539c9 Upgrade lavaplayer 2018-02-14 12:46:14 +01:00
823a47d31b Finish token check 2018-02-14 12:32:56 +01:00
2f6914a307 Adding token on command 2018-02-14 10:25:08 +01:00
ebe635acd9 Adding connection on navbar 2018-02-13 16:31:57 +01:00
4b6b6680fe Finish connection api 2018-02-13 16:29:36 +01:00
650da78fe6 Adding Register process 2018-02-12 11:21:21 +01:00
5d7a7a7299 Correct link et ico 2018-02-12 11:17:51 +01:00
aeeac91a32 Adding DB for user management 2018-02-12 11:16:44 +01:00
26759154df Merge branch 'master' into devel 2018-01-18 11:02:49 +01:00
5bb78e232e Reorganization of packages 2018-01-18 10:28:54 +01:00
c8a13835b6 Merge branch 'master' into devel 2018-01-16 15:28:09 +01:00
4e6a4250eb Update Log 2018-01-13 19:19:30 +01:00
41e58f7c46 Adding Dell button 2018-01-13 19:12:02 +01:00
1cf8f16bdb Clean repo 2018-01-13 00:01:45 +01:00
41de929d35 Update install methods 2018-01-12 23:59:12 +01:00
1860227814 Merge branch 'devel' 2018-01-12 23:50:26 +01:00
4e0cceb508 Correct Playlist order when added on top 2018-01-12 23:50:13 +01:00
e59581f464 Merge branch 'devel' 2018-01-12 19:14:57 +01:00
3d661951bd Adding connect to vocal on web page 2018-01-12 19:14:43 +01:00
d729b7875c Merge branch 'master' into devel 2018-01-12 15:00:50 +01:00
fc35527b98
Update build.gradle 2018-01-12 14:56:36 +01:00
2e31a4d4c1
Remove experimental test 2018-01-12 14:18:50 +01:00
48b96c2c55 Merge branch 'devel' 2018-01-12 13:05:27 +01:00
1fa95fb3c0 Remove experimental test 2018-01-12 13:04:53 +01:00