mirror/Plan
2
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-21 05:50:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
795 Commits 32 Branches 234 Tags 130 MiB
dced471adb
Commit Graph

795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rsl1122
dced471adb Finishing touches to Listener-Process system 2017-08-24 13:23:44 +03:00
Rsl1122
11ba16d918 CommandUseTable updated the the save method 2017-08-24 12:53:14 +03:00
Rsl1122
a920c4254b MySQL max connections: 8 2017-08-24 12:08:46 +03:00
Rsl1122
4a12f6e113 Fix compile issues 2017-08-24 11:59:51 +03:00
Rsl1122
b1bee36f2c Merge branch '4.0.0-Connection-Pool-Branch' into 4.0.0-BungeeCord-Support 
# Conflicts:
#	Plan/src/main/java/com/djrapitops/plan/Plan.java
#	Plan/src/main/java/com/djrapitops/plan/systems/webapi/bukkit/ConfigureWebAPI.java
 2017-08-24 11:57:03 +03:00
Rsl1122
0029829d7b Merge branch '4.0.0-BungeeCord-Support' of https://github.com/Rsl1122/Plan-PlayerAnalytics into 4.0.0-BungeeCord-Support 2017-08-24 11:54:26 +03:00
Rsl1122
6214cad6d5 Merge branch '4.0.0-Connection-Pool-Branch' of https://github.com/Rsl1122/Plan-PlayerAnalytics into 4.0.0-Connection-Pool-Branch 
# Conflicts:
#	Plan/test/test/java/utils/DBTestSuite.java
 2017-08-24 11:49:09 +03:00
Rsl1122
db2577e304 UrlParser 2017-08-24 11:46:50 +03:00
Rsl1122
5de19263ee Merge pull request #274 from Fuzzlemann/master 
PR for the Connection Pool
 2017-08-24 11:42:33 +03:00
Fuzzlemann
0a72a3c065 Fix Server Startup 
Add Container Test
 2017-08-24 10:16:43 +02:00
Rsl1122
c4a55c6f8c Rename Page- & GeolocationCacheHandler -> -Cache 2017-08-24 11:09:29 +03:00
Rsl1122
e74c19a28f Rename KillData -> PlayerKill 2017-08-24 10:56:35 +03:00
Rsl1122
c7ce74a78c Merge remote-tracking branch 'origin/4.0.0-BungeeCord-Support' into 4.0.0-BungeeCord-Support 
# Conflicts:
#	Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanPlayerListener.java
#	Plan/src/main/java/com/djrapitops/plan/systems/processing/DBCommitProcessor.java
#	Plan/src/main/java/com/djrapitops/plan/systems/tasks/PeriodicDBCommitTask.java
 2017-08-24 10:25:33 +03:00
Fuzzlemann
954ff23667 Fix some more tests 
Add some assertions so IntelliJ isn't crying
 2017-08-24 09:24:21 +02:00
Rsl1122
263891d1f1 Restructure package structure. 2017-08-24 10:24:04 +03:00
Rsl1122
29542b34b7 Merge branch '4.0.0-Connection-Pool-Branch' of https://github.com/Rsl1122/Plan-PlayerAnalytics into 4.0.0-Connection-Pool-Branch 2017-08-23 23:33:05 +03:00
Rsl1122
6094f2fbdd Merge pull request #272 from Fuzzlemann/master 
PR for 4.0.0 (Fuzzlemann) (7)
 2017-08-23 23:32:40 +03:00
Fuzzlemann
238a547181 Fix tests 2017-08-23 22:30:19 +02:00
Fuzzlemann
8b9acc3382 Merge branch '4.0.0-Connection-Pool-Branch' of https://github.com/Rsl1122/Plan-PlayerAnalytics 
# Conflicts:
#	Plan/test/test/java/utils/TestInit.java
 2017-08-23 21:30:19 +02:00
Rsl1122
c268a44dcd Merge branch '4.0.0-Connection-Pool-Branch' of https://github.com/Rsl1122/Plan-PlayerAnalytics into 4.0.0-Connection-Pool-Branch 
# Conflicts:
#	Plan/test/test/java/main/java/com/djrapitops/plan/database/DatabaseTest.java
#	Plan/test/test/java/utils/TestInit.java
 2017-08-23 22:16:30 +03:00
Rsl1122
b4abc6a776 Merge branch '4.0.0-Connection-Pool-Branch' of https://github.com/Rsl1122/Plan-PlayerAnalytics into 4.0.0-Connection-Pool-Branch 
# Conflicts:
#	Plan/test/test/java/main/java/com/djrapitops/plan/database/DatabaseTest.java
#	Plan/test/test/java/utils/TestInit.java
 2017-08-23 22:16:12 +03:00
Rsl1122
f7a99d0789 Merge pull request #271 from Rsl1122/4.0.0-BungeeCord-Support 
Mid branch PR 4.0.0 Main branch -> Connection-Pool-Branch
 2017-08-23 22:02:51 +03:00
Rsl1122
90cab04406 Merge branch '4.0.0-Connection-Pool-Branch' into 4.0.0-BungeeCord-Support 2017-08-23 22:02:41 +03:00
Rsl1122
6cd18c8d30 Database Tests 2017-08-23 21:53:17 +03:00
Rsl1122
c84e8f434e TPSTable, TPSInsertProcessor 2017-08-23 19:01:58 +03:00
Rsl1122
1ca145165c UserInfo table, Removed InspectCache, Rewrote UserData 2017-08-23 18:48:06 +03:00
Fuzzlemann
7de5072bc5 Add Graph Tests 2017-08-23 17:43:52 +02:00
Rsl1122
6998def8df Move testfolder cleaning to TestInit 2017-08-23 17:25:12 +03:00
Rsl1122
05e06ebb76 Merge pull request #270 from Fuzzlemann/master 
PR for 4.0.0 (Fuzzlemann) (6)
 2017-08-23 17:13:06 +03:00
Fuzzlemann
68f8159027 Closes 2 not-closed sets 
Add error-handling if the processor wasn't added into the Queue
 2017-08-23 14:43:44 +02:00
Fuzzlemann
a5d90f092d Fix Tests 2017-08-23 14:33:51 +02:00
Fuzzlemann
7587792c73 Add missing endTransactions 
Rename usingHTTPS() to isUsingHTTPS()
 2017-08-23 14:25:50 +02:00
Fuzzlemann
8bffdba725 Fix compilation error 2017-08-23 14:11:50 +02:00
Fuzzlemann
2df6169dd9 Merge branch '4.0.0-BungeeCord-Support' of https://github.com/Rsl1122/Plan-PlayerAnalytics 
# Conflicts:
#	Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanPlayerListener.java
#	Plan/src/main/java/com/djrapitops/plan/database/Database.java
#	Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java
#	Plan/src/main/java/com/djrapitops/plan/database/tables/KillsTable.java
#	Plan/src/main/java/com/djrapitops/plan/database/tables/NicknamesTable.java
#	Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java
#	Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java
#	Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTimesTable.java
 2017-08-23 14:11:08 +02:00
Rsl1122
fe3a4fdbf1 Fix Compile issues 2017-08-23 14:25:54 +03:00
Rsl1122
5ee7b9de35 Cleaned up TPSTable column variables 2017-08-23 14:09:58 +03:00
Rsl1122
3ea691f4d0 Cleaned up createTable methods 2017-08-23 14:02:39 +03:00
Rsl1122
c205a85a6a Deleted KillHandling, Cleaned Database RemoveUser methods 2017-08-23 13:56:44 +03:00
Rsl1122
f635ccbf0a UsersTable, processing 2017-08-23 13:39:14 +03:00
Rsl1122
a4ae93390c Formatted SecurityTable 2017-08-23 12:53:17 +03:00
Rsl1122
4516ab81bf NicknamesTable 2017-08-23 12:48:24 +03:00
Rsl1122
75d1a3e88c DB Formatting 2017-08-23 12:31:34 +03:00
Rsl1122
3c8d8bc8a8 WorldTimesTable 2017-08-23 12:11:18 +03:00
Fuzzlemann
dc08f96d43 Removes DBCommitProcessor 2017-08-23 10:42:19 +02:00
Rsl1122
1c49dfbdfd KillsTable 2017-08-23 11:29:33 +03:00
Rsl1122
c6fbb12d2d SessionTable 2017-08-23 10:51:46 +03:00
Fuzzlemann
5de5ea25a8 Fix Test Suite 2017-08-22 20:27:01 +02:00
Fuzzlemann
654ff26fb6 Fixes Clearing of the data, the pool itself 2017-08-22 19:44:59 +02:00
Fuzzlemann
82da226edb First try on Connection Pool 2017-08-22 18:26:59 +02:00
Fuzzlemann
6f807c123d Merge branch '4.0.0-BungeeCord-Support' of https://github.com/Rsl1122/Plan-PlayerAnalytics 2017-08-22 17:23:58 +02:00