Commit Graph

744 Commits

Author SHA1 Message Date
Fuzzlemann
fd68be94ee Merge branch '3.7.0' of https://github.com/Rsl1122/Plan-PlayerAnalytics 2017-08-15 19:08:46 +02:00
Fuzzlemann
9c886a16b4 Move tests 2017-08-15 19:07:32 +02:00
Rsl1122
84f0ef5e1c Add a todo 2017-08-15 18:33:51 +03:00
Fuzzlemann
dc262a76f0 Re-enable tests for FormatTimeStamp 2017-08-15 15:10:58 +02:00
Fuzzlemann
725981120a Merge branch 'master' of https://github.com/Fuzzlemann/Plan-PlayerAnalytics 2017-08-15 15:10:40 +02:00
Fuzzlemann
e22302a556 Merge branch '3.7.0' of https://github.com/Rsl1122/Plan-PlayerAnalytics 2017-08-15 15:07:31 +02:00
Fuzzlemann
1dab1f9adf Re-enable tests for FormatTimeStamp 2017-08-15 15:02:06 +02:00
Rsl1122
7e9b64bf34 Merge branch '3.7.0' into master 2017-08-15 15:09:24 +03:00
Rsl1122
a2c4f150c5 Reverts commit 59da922490. 2017-08-15 15:06:41 +03:00
Fuzzlemann
659bc8d1db Adds the removal of the cached player pages on analysis 2017-08-15 13:51:24 +02:00
Fuzzlemann
ad2a3d80ae Change some PageCacheHandlerTest methods 2017-08-15 13:04:59 +02:00
Fuzzlemann
8eff9720ba Add a test for the PageCacheHandler 2017-08-15 00:11:15 +02:00
Fuzzlemann
521950804c Change GeolocationCacheTest 2017-08-14 23:40:20 +02:00
Fuzzlemann
bdb4b4ffbe Add GeolocationCache Tests
Changes some debug messages of the GeolocationCache
2017-08-14 23:37:48 +02:00
Fuzzlemann
28a9ea870f Rename some test method names 2017-08-14 22:54:50 +02:00
Fuzzlemann
b2a027742e Add rounding test 2017-08-14 22:37:58 +02:00
Fuzzlemann
295144ad42 Add normalization of the Item Name (e.g. GOLD_SWORD -> Gold Sword), test incl.
Fixes test error
2017-08-14 22:14:29 +02:00
Fuzzlemann
198c902b8f Reverts some changes 2017-08-13 15:35:52 +02:00
Fuzzlemann
755a0b3949 Merge branch '3.7.0' of https://github.com/Rsl1122/Plan-PlayerAnalytics 2017-08-13 14:53:03 +02:00
Rsl1122
29d54e88da Merge pull request #246 from Rsl1122/master
Update upstream
2017-08-13 11:44:06 +03:00
Rsl1122
00c2524316 Update API.md 2017-08-12 19:06:42 +03:00
Fuzzlemann
2a7f23d516 Merge branch '3.7.0' of https://github.com/Rsl1122/Plan-PlayerAnalytics 2017-08-12 15:49:58 +02:00
Rsl1122
8087e7e50e Merge branch '3.7.0'
# Conflicts:
#	Plan/src/main/java/com/djrapitops/plan/locale/Locale.java
2017-08-12 16:42:32 +03:00
Rsl1122
2a32de97d2 Fix merge issues 2017-08-12 16:41:02 +03:00
Fuzzlemann
5996f7cba4 Removes unused Request class 2017-08-12 15:19:44 +02:00
Rsl1122
450f777de8 Debug on disable. 2017-08-12 16:17:53 +03:00
Fuzzlemann
7906459fc8 Removes unnecessary semicolon 2017-08-12 15:12:28 +02:00
Rsl1122
d4cd53cd07 Merge pull request #243 from Fuzzlemann/master
PR for 3.6.3 (Fuzzlemann) (2)
2017-08-12 16:08:57 +03:00
Rsl1122
86e6a51d69 Remove useless debug messages
Config bump to 3.6.3
2017-08-12 16:08:24 +03:00
Fuzzlemann
1c5db5bad0 Reformats code 2017-08-12 15:07:15 +02:00
Fuzzlemann
deae15faa3 Merge branch '3.7.0' of https://github.com/Rsl1122/Plan-PlayerAnalytics 2017-08-12 15:01:44 +02:00
Fuzzlemann
559238c3da Add some more JavaDocs 2017-08-12 15:01:03 +02:00
Fuzzlemann
19ce7b5ed6 Removes Html.loadLocale(File) 2017-08-12 14:23:02 +02:00
Rsl1122
d550a191ce Remove useless debug messages 2017-08-12 14:13:21 +03:00
Fuzzlemann
891bb90a3a Removes unnecessary brackets 2017-08-12 12:57:33 +02:00
Rsl1122
baf24c5673 Merge pull request #241 from Rsl1122/Fuzzlemann-master
Merge fixes Fuzzlemann master
2017-08-12 13:03:52 +03:00
Rsl1122
a38e103456 Merge branch 'master' of https://github.com/Fuzzlemann/Plan-PlayerAnalytics into Fuzzlemann-master
# Conflicts:
#	Plan/src/main/java/com/djrapitops/plan/utilities/file/dump/DumpUtils.java
2017-08-12 13:00:59 +03:00
Rsl1122
3d82250a49 Merge pull request #239 from Rsl1122/revert-236-master
Revert "PR for 3.6.3 (Fuzzlemann) (1)"
2017-08-12 12:49:38 +03:00
Rsl1122
59da922490 Revert "PR for 3.6.3 (Fuzzlemann) (1)" 2017-08-12 12:49:25 +03:00
Rsl1122
74328b7370 Merge pull request #236 from Fuzzlemann/master
PR for 3.6.3 (Fuzzlemann) (1)
2017-08-12 12:48:56 +03:00
Rsl1122
0a74e37122 Remove some Useless debug information 2017-08-12 12:45:08 +03:00
Rsl1122
9e78f62267 APF 2.0.3
Fixes #234 #233 #237
Fixes Files.lines streams not being closed
2017-08-12 12:24:04 +03:00
Fuzzlemann
94e1003fcf Remove unnecessary comments
Change some == to === in JS Code
2017-08-12 01:00:25 +02:00
Fuzzlemann
2365ac2cc7 Remove unnecessary throw 2017-08-12 00:52:42 +02:00
Fuzzlemann
d8c42faaca Add some more Identifiers
Inline one variable
2017-08-12 00:50:16 +02:00
Fuzzlemann
c95b72239e Add Identifiers
Change DataCacheGetQueue#containsUUIDToBeCached
2017-08-12 00:45:58 +02:00
Fuzzlemann
26c3cd45aa Change variable / method names to match Java Conventions 2017-08-12 00:32:20 +02:00
Fuzzlemann
a1e87089bb Change Locale#getMessage to using HashMap#getOrDefault 2017-08-12 00:29:47 +02:00
Fuzzlemann
2a5a671786 Put Benchmark.stop into finally clause 2017-08-12 00:27:34 +02:00
Fuzzlemann
a7b27d7b0b Replace Statement with Expression lambda 2017-08-11 18:19:26 +02:00