Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-11-13 22:25:53 +01:00
Code Issues Projects Releases Wiki Activity
2,998 Commits 48 Branches 233 Tags 93 MiB
4a5f4b80d1
Commit Graph

2998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
4a5f4b80d1
Merge pull request #981 from plan-player-analytics/dependabot/gradle/Plan/development/org.xerial-sqlite-jdbc-3.27.2.1 2019-03-21 06:16:45 +00:00
dependabot[bot]
26bd92f3ca
Bump sqlite-jdbc from 3.27.2 to 3.27.2.1 in /Plan 
Bumps [sqlite-jdbc](https://github.com/xerial/sqlite-jdbc) from 3.27.2 to 3.27.2.1.
- [Release notes](https://github.com/xerial/sqlite-jdbc/releases)
- [Changelog](https://github.com/xerial/sqlite-jdbc/blob/master/CHANGELOG)
- [Commits](https://github.com/xerial/sqlite-jdbc/compare/3.27.2...3.27.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-21 06:06:54 +00:00
dependabot[bot]
829bfa80fa
Merge pull request #980 from plan-player-analytics/dependabot/maven/PlanPluginBridge/development/io.github.nucleuspowered-nucleus-api-1.9.2-S7.1 2019-03-21 05:54:03 +00:00
dependabot[bot]
ff061be599
Bump nucleus-api from 1.9.1-S7.1 to 1.9.2-S7.1 in /PlanPluginBridge 
Bumps nucleus-api from 1.9.1-S7.1 to 1.9.2-S7.1.

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-21 05:45:06 +00:00
dependabot[bot]
535c24600d Bump junit-jupiter-params from 5.4.0 to 5.4.1 in /Plan 
Bumps [junit-jupiter-params](https://github.com/junit-team/junit5) from 5.4.0 to 5.4.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.4.0...r5.4.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-18 13:35:42 +00:00
dependabot[bot]
09cf31d9cb Bump mockito-core from 2.25.0 to 2.25.1 in /Plan 
Bumps [mockito-core](https://github.com/mockito/mockito) from 2.25.0 to 2.25.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v2.25.0...v2.25.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-18 13:17:31 +00:00
dependabot[bot]
2e617341bc Bump junit-vintage-engine from 5.4.0 to 5.4.1 in /Plan 
Bumps [junit-vintage-engine](https://github.com/junit-team/junit5) from 5.4.0 to 5.4.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.4.0...r5.4.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-18 13:00:35 +00:00
dependabot[bot]
b55c560c98 Bump junit-platform-runner from 1.4.0 to 1.4.1 in /Plan 
Bumps [junit-platform-runner](https://github.com/junit-team/junit5) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-18 12:43:07 +00:00
dependabot[bot]
eb8ea12399 Bump mockito-junit-jupiter from 2.25.0 to 2.25.1 in /Plan 
Bumps [mockito-junit-jupiter](https://github.com/mockito/mockito) from 2.25.0 to 2.25.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v2.25.0...v2.25.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-18 12:30:41 +00:00
dependabot[bot]
25366ab85b Bump junit-jupiter-engine from 5.4.0 to 5.4.1 in /Plan 
Bumps [junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.4.0 to 5.4.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.4.0...r5.4.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-18 12:21:21 +00:00
dependabot[bot]
5884bedb54 Bump sqlite-jdbc from 3.25.2 to 3.27.2 in /Plan 
Bumps [sqlite-jdbc](https://github.com/xerial/sqlite-jdbc) from 3.25.2 to 3.27.2.
- [Release notes](https://github.com/xerial/sqlite-jdbc/releases)
- [Changelog](https://github.com/xerial/sqlite-jdbc/blob/master/CHANGELOG)
- [Commits](https://github.com/xerial/sqlite-jdbc/compare/3.25.2...3.27.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-15 12:20:46 +00:00
Rsl1122
0d4d174493 Version bump to 4.7.2 2019-03-10 13:57:33 +02:00
Rsl1122
e04633d916 Improved name encoding of export filenames 2019-03-10 13:55:02 +02:00
Rsl1122
5ef3c64dc3 Added progress messages to export players command 2019-03-10 13:54:43 +02:00
Rsl1122
228e2d509c Removed some usages of DataContainer#getUnsafe 
Fixes Unsupported Key exception on player JSON export
 2019-03-10 13:27:04 +02:00
Rsl1122
3167cc5f6a [#958] Export Command + online status change export 
Added /plan manage export that can be used to export all players
based on config settings. Arguments: list, players, server_json
Permission: plan.manage

Added a config setting 'Export.Export_player_on_login_and_logout' for
exporting player page and JSON based on config settings on
login or logout.
 2019-03-10 13:11:39 +02:00
Rsl1122
0ed86b532c Workaround for ServerInfo related hang on enable 2019-03-08 16:31:10 +02:00
Rsl1122
c22740deaa [#956] Made serverBaseUser Query return a Set instead of List 
Also changed BaseUser#equals to make sure only a single BaseUser per
UUID + name is present
 2019-03-08 14:44:46 +02:00
Rsl1122
248e662414 Fixed test fail caused by transaction isolation 
Since each transaction is isolated, any inserts done in the
transaction do not affect the queries in the transaction.

Since TestData had both PlayerRegisterTransaction and
PlayerServerRegisterTransaction (extends former) the tests failed as
query for plan_users register status returned false even though
the previously executed statement inserted the user.
 2019-03-08 10:26:29 +02:00
Rsl1122
4215939deb Attempt to catch #956 with tests 2019-03-08 10:00:49 +02:00
Rsl1122
8a13f1d792 Created a better test dataset 2019-03-08 09:35:23 +02:00
dependabot[bot]
9fbf354cdd Bump nucleus-api from 1.9.0-S7.1 to 1.9.1-S7.1 in /PlanPluginBridge 
Bumps nucleus-api from 1.9.0-S7.1 to 1.9.1-S7.1.

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-07 12:22:03 +00:00
Rsl1122
972e54a351 Merge branch 'master' into development 2019-03-06 15:55:39 +02:00
dependabot[bot]
01eb4ead44 Bump mockito-core from 2.24.5 to 2.25.0 in /Plan 
Bumps [mockito-core](https://github.com/mockito/mockito) from 2.24.5 to 2.25.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v2.24.5...v2.25.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-06 12:34:13 +00:00
dependabot[bot]
c6ad91241d Bump mockito-junit-jupiter from 2.24.5 to 2.25.0 in /Plan 
Bumps [mockito-junit-jupiter](https://github.com/mockito/mockito) from 2.24.5 to 2.25.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v2.24.5...v2.25.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-06 12:20:43 +00:00
Risto Lahtela
f281f26543
[Merge] Version 4.7.1 (#950) 2019-03-06 10:25:26 +02:00
Risto Lahtela
302f36ab7f
Update versions.txt 2019-03-06 10:24:37 +02:00
Rsl1122
37a1d53251 Version bump to 4.7.1 2019-03-06 10:14:53 +02:00
Rsl1122
19f85afea3 [#948] Fixed Server JSON export 2019-03-05 16:47:55 +02:00
dependabot[bot]
ddf4414348 Bump nucleus-api from 1.8.3-S7.1 to 1.9.0-S7.1 in /PlanPluginBridge 
Bumps nucleus-api from 1.8.3-S7.1 to 1.9.0-S7.1.

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-05 12:21:22 +00:00
Risto Lahtela
8cccd4d4d6
Update versions.txt 2019-03-05 14:15:23 +02:00
Rsl1122
423d9c88a0 [#943] Removed unnecessary Server UUID column from some queries 2019-03-05 13:36:29 +02:00
Rsl1122
a235bda099 [#942] Reproduced & fixed WorldMap error 
Error was caused by two different unknown geolocations ("Local Machine",
"Not Known") mapping to null due to missing Geo code (eg. 'FIN')
 2019-03-04 10:31:22 +02:00
Risto Lahtela
0f32c030e6
Update versions.txt 2019-03-03 19:42:29 +02:00
Risto Lahtela
45b33e49e0
[Merge] 4.7.0 (#941) 2019-03-03 19:41:32 +02:00
Risto Lahtela
720bfafb02
Merge branch 'master' into development 2019-03-03 19:40:53 +02:00
Rsl1122
cc4af67412 Fixed /server page back button 2019-03-03 19:15:37 +02:00
Rsl1122
d2551a206d Fixed concurrent modification on FileWatcher 2019-03-03 19:12:48 +02:00
Rsl1122
1f341c0921 Version bump to 4.7.0 2019-03-03 19:11:50 +02:00
Rsl1122
016e1dc4bc PluginData related error message clarification 2019-03-03 18:59:27 +02:00
Rsl1122
1c4938a3db [#934, #939] Attempt to fix broken databases 2019-03-03 18:46:28 +02:00
Risto Lahtela
d9c2934104
Update versions.txt 2019-03-01 11:32:49 +02:00
Rsl1122
fd2e45b204 Test against #934 on MySQL 2019-03-01 11:14:21 +02:00
Rsl1122
c9c696e71d [#935] Made GenerateAnalysisPageRequest run analysis async 2019-03-01 10:26:56 +02:00
Rsl1122
ad2208d7ff [Vuln] Login now blocked for 90s after 5 failed attempts. 2019-03-01 10:16:13 +02:00
Rsl1122
75782562f9 Fixed authentication message showing '/' 2019-03-01 09:41:41 +02:00
Rsl1122
6806e6c98e [#937] Fixed nested transactions that query database. 
Nested transactions, Transaction#executeOther(Transaction), where the
inner transaction performed a query ran into NPE since the Database
used for the query had not been defined.
 2019-02-28 19:18:17 +02:00
Rsl1122
5eef819308 Fixed bad default value in bungee config 2019-02-28 19:14:52 +02:00
Rsl1122
93e7410ad2 Fix PlanConfig constructor usage in tests 2019-02-28 17:52:05 +02:00
Rsl1122
be8a3b484f PlanConfig#getOrDefault 2019-02-28 17:46:23 +02:00