Commit Graph

872 Commits

Author SHA1 Message Date
Rsl1122
1709ba394e Apparently artifact id can't be changed temporarily 2017-08-20 10:51:19 +03:00
Rsl1122
e3712f0e4c Merge remote-tracking branch 'origin/4.0.0-BungeeCord-Support' into 4.0.0-BungeeCord-Support
# Conflicts:
#	Plan/src/main/java/com/djrapitops/plan/Plan.java
2017-08-20 10:46:39 +03:00
Rsl1122
d27144455e Disabled Metrics 2017-08-20 10:44:58 +03:00
Rsl1122
e2a587a527 Merge pull request #264 from Fuzzlemann/master
PR for 4.0.0 (Fuzzlemann) (2)
2017-08-20 10:44:29 +03:00
Fuzzlemann
27add1ea47 Add Exception handling when the POST Request is encoded in the wrong encoding 2017-08-20 02:35:55 +02:00
Fuzzlemann
dcff04b73a Add Exception Handling when an error at the API happens 2017-08-20 02:25:09 +02:00
Fuzzlemann
c37b0c8941 Replace the old placeholder system with the new one (%PLACEHOLDER% -> ${PLACEHOLDER}) 2017-08-20 02:07:19 +02:00
Fuzzlemann
971007b589 Outsource the Web APIs into their own separate classes 2017-08-19 18:03:56 +02:00
Rsl1122
25bdd2161e Merge pull request #262 from Fuzzlemann/master
PR for 4.0.0 (Fuzzlemann) (1)
2017-08-19 18:19:34 +03:00
Fuzzlemann
67152ea5cc Remove a whitespace 2017-08-19 17:18:38 +02:00
Fuzzlemann
751719b357 Add the Web API for Bukkit 2017-08-19 16:55:34 +02:00
Fuzzlemann
82cf6e62fd Remove "/" at the CommandInfo 2017-08-18 18:00:39 +02:00
Fuzzlemann
bcd008cbbe Sorting ignores now the case 2017-08-18 17:15:23 +02:00
Fuzzlemann
21aec1fb6d Merge branch '4.0.0-BungeeCord-Support' of https://github.com/Rsl1122/Plan-PlayerAnalytics 2017-08-18 12:29:59 +02:00
Fuzzlemann
486a67a013 Simplify PlayersTableCreator#getActivityString
Remove @SafeVarargs annotation
2017-08-18 12:28:11 +02:00
Rsl1122
53734b5e8c [3.6.4] Merge pull request #251 from Rsl1122/3.7.0
Main PR for 3.6.4
2017-08-18 11:42:50 +03:00
Rsl1122
3a5226aa94 Fix issue with casting Player, 3.6.4 bump 2017-08-18 11:36:04 +03:00
Rsl1122
541eab13c0 Merge pull request #259 from Fuzzlemann/master
PR for 3.6.4 (Fuzzlemann) (4)
2017-08-18 11:25:37 +03:00
Rsl1122
a19fca8343 Removed Locale.unload temporarily due to reload issues 2017-08-18 11:18:51 +03:00
Rsl1122
844d567243 #256 2017-08-18 11:15:36 +03:00
Rsl1122
a34170b6c9 Fixed the colors for TPS graph 2017-08-18 11:03:06 +03:00
Rsl1122
f31aa57795 Add colors for #180 2017-08-18 10:18:12 +03:00
Rsl1122
9e76dfdb4d Possibly Fix #247 2017-08-18 10:04:38 +03:00
Fuzzlemann
b4e1014d59 Merge branch '3.7.0' of https://github.com/Rsl1122/Plan-PlayerAnalytics 2017-08-17 20:40:25 +02:00
Rsl1122
7ee1c6eef6 Fix sonar issues with PluginBridge 2017-08-17 18:03:45 +03:00
Fuzzlemann
5eecaf0b12 Change some HastebinTest methods 2017-08-17 14:43:07 +02:00
Fuzzlemann
47d97252a6 Add Tests for DumpLog 2017-08-17 14:40:53 +02:00
Fuzzlemann
15587946e6 Fix HastebinTest (Thread wasn't started...) 2017-08-17 14:29:18 +02:00
Rsl1122
5cc5d61816 Fix PluginBridge (#254 #253 #232) 2017-08-17 11:23:14 +03:00
Rsl1122
53f27a66a3 Fix broken test 2017-08-17 10:26:46 +03:00
Rsl1122
d83cc2b9f8 Fix method calls 2017-08-17 10:25:31 +03:00
Rsl1122
e9b06f4581 Removed old PlayerActivityGraphCreatorTest
Fix some code smells
2017-08-17 10:24:39 +03:00
Rsl1122
b1692f07c5 Move to APF 2.0.4 2017-08-17 10:13:23 +03:00
Rsl1122
77dd64d10a Merge pull request #255 from Fuzzlemann/master
PR for 3.6.4 (Fuzzlemann) (3)
2017-08-17 09:51:25 +03:00
Rsl1122
e3ab0ae1c3 Remove some of processStatus calls 2017-08-17 09:50:56 +03:00
Fuzzlemann
9007181b39 Merge branch 'master' of https://github.com/Fuzzlemann/Plan-PlayerAnalytics 2017-08-16 19:40:13 +02:00
Fuzzlemann
2b85f43cd2 Merge branch '3.7.0' of https://github.com/Rsl1122/Plan-PlayerAnalytics 2017-08-16 19:37:29 +02:00
Rsl1122
4f2a946203 Merge branch '3.7.0' into master 2017-08-16 19:16:29 +03:00
Rsl1122
40c5834a8e Reduce complexity 2017-08-16 19:15:30 +03:00
Fuzzlemann
023b3f666f Extract nested ternary operations into independent statements 2017-08-16 18:07:10 +02:00
Fuzzlemann
a060182e49 Rename 'message' to 'content'
Use 'p' in Message#toArray(Serializable...)
2017-08-16 17:58:27 +02:00
Fuzzlemann
f2ce603f37 Replace HashMap with EnumMap 2017-08-16 17:56:02 +02:00
Fuzzlemann
73cbf73d78 Rename bStats to metrics
Remove '"" +'
2017-08-16 17:51:32 +02:00
Rsl1122
268dae902f Rename VARCHAR to varchar 2017-08-16 18:38:19 +03:00
Fuzzlemann
c615d9f9a2 Merge branch '3.7.0' of https://github.com/Rsl1122/Plan-PlayerAnalytics 2017-08-16 17:14:51 +02:00
Fuzzlemann
44fcb9ec7b Fixes failing of test when Hastebin is not available 2017-08-16 17:14:11 +02:00
Rsl1122
5204d52d78 SQL parsing for Table creation statements 2017-08-16 17:56:06 +03:00
Fuzzlemann
2a12e93ef7 Add a case when Hastebin is not available 2017-08-16 16:52:16 +02:00
Fuzzlemann
4e34eb170d Add tests for Hastebin 2017-08-16 16:41:51 +02:00
Fuzzlemann
c831ccb9ec Separates the Hastebin upload part into an external class
Fixes a bug in the uploading to Hastebin
2017-08-16 16:25:42 +02:00