Commit Graph

2213 Commits

Author SHA1 Message Date
ljacqu
5c43aea21f Merge branch '547-process-architecture' of https://github.com/AuthMe-Team/AuthMeReloaded into master2 2016-02-28 21:02:04 +01:00
ljacqu
dede592c55 #547 add process service to AsyncJoin 2016-02-28 20:03:06 +01:00
Gabriele C
2a9ab60fcd Pom cleanup 2016-02-28 19:11:22 +01:00
ljacqu
7dd1d52893 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 547-process-architecture
Conflicts:
	src/main/java/fr/xephi/authme/settings/Settings.java
2016-02-28 09:08:35 +01:00
ljacqu
8832c1ac0f Reduce output of resource closing tests 2016-02-28 09:05:30 +01:00
Gabriele C
90a0202b49 Fixed, finally!
Was a jenkins side issue!
2016-02-28 03:21:07 +01:00
Gabriele C
aaf17e6272 Damn mvn args 2016-02-28 03:14:36 +01:00
Gabriele C
cfdc99cfe6 Should fix mvn param 2016-02-28 03:04:43 +01:00
Gabriele C
a96a98e4ed Speed up junit 2016-02-28 02:28:37 +01:00
Gabriele C
3c82a5a936 Fix test arguments 2016-02-28 02:02:27 +01:00
Gabriele C
89256debc8 Update .travis.yml 2016-02-28 00:37:47 +01:00
Gabriele C
a233b0e685 Update circle.yml 2016-02-28 00:37:29 +01:00
Xephi59
2a8ef88041 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded.git 2016-02-28 00:36:15 +01:00
Xephi59
e88b4eda53 Add %acc_nb tag to max_reg message - Fix #570 2016-02-28 00:36:06 +01:00
Gabriele C
c61345fd43 cleanup + fix test crypts test on windows systems 2016-02-28 00:32:25 +01:00
ljacqu
d664e7be26 #547 Create ProcessService
- Create ProcessService for common tasks within processes
- Integrate service into AsyncAddEmail
2016-02-27 23:15:31 +01:00
ljacqu
28108f00f1 #569 Update messages_de.yml by Platinteufel 2016-02-27 22:55:51 +01:00
ljacqu
63b31b0814 Create resource closing test
- Generic test for MySQL and SQLite checking that all generated (Prepared)Statement and ResultSet instances are closed afterwards
- Fix offending code for test to pass
2016-02-27 22:45:39 +01:00
ljacqu
5fce849ce7 Minor - Add datasource test, minor code householding 2016-02-27 21:11:35 +01:00
ljacqu
b916c9b2be Fix javadoc warnings + #421 add javadoc for new API 2016-02-27 16:31:58 +01:00
Gabriele C
4bf8972875 Lombok + Retrolambda expressions support 2016-02-27 16:12:04 +01:00
ljacqu
e79f325411 #443 Use correct message to ask to add email after login 2016-02-27 12:18:04 +01:00
ljacqu
1b818bd833 #457 Improve ForceFlatToSqlite conversion
- Change ForceFlatToSqlite converter to use a generic datasource destination (i.e. can be used for Flat2MySQL later)
- Add tests, including for FlatFile
- Check that user is not present in destination datasource before adding
- Persist last location from flatfile as well
2016-02-27 11:24:47 +01:00
Gabriele C
0e6d0c6d25 Merge pull request #564 from AuthMe-Team/master
DB Hotfix
2016-02-27 01:14:57 +01:00
ljacqu
27b1fa770f #392 Add datasource integration tests 2016-02-26 22:12:16 +01:00
DNx
12691a12f1 Merge pull request #112 from AuthMe-Team/db-improve 2016-02-27 00:48:33 +07:00
Gabriele C
6d8e9d413f Switch to Essentials due to issues with the EssentialsX repo 2016-02-26 15:42:54 +01:00
Gabriele C
784b0cadfb Merge pull request #114 from AuthMe-Team/master
Fix EssentialsX dependency
2016-02-26 15:34:21 +01:00
Gabriele C
3f3b1cfde5 Fix EssentialsX dependency 2016-02-26 15:31:14 +01:00
DNx5
b4aebb685c Remove player from cache on quit. 2016-02-26 13:10:49 +07:00
DNx5
8bf6817a5f Removed unused private methods in AuthMe class. 2016-02-26 12:47:08 +07:00
DNx5
8324decfa1 Merge branch 'master' into db-improve
Conflicts:
	src/main/java/fr/xephi/authme/AuthMe.java
2016-02-26 12:42:32 +07:00
DNx5
1b65b285ac improve spawn location check. 2016-02-26 12:00:53 +07:00
DNx5
775e2f7039 Async refresh. 2016-02-26 11:37:47 +07:00
DNx5
8536f85361 Fix #558 2016-02-25 16:46:16 +07:00
FabioZumbi12
2486a50236 Merge pull request #2 from AuthMe-Team/master
Try to fix sql build!
2016-02-25 02:35:37 -03:00
ljacqu
69092e9a9c #392 Add datasource integration tests 2016-02-24 21:50:40 +01:00
ljacqu
95e3943be0 Datasource integration tests - fix split by newline
- Make split of SQL file aware that new lines may be \r\n
- Remove split of new lines in MySQL as it's not necessary
2016-02-24 20:38:05 +01:00
DNx5
1d1605314a Reload correctly. Fix #554 2016-02-24 22:41:09 +07:00
FabioZumbi12
cdf06574e5 Merge pull request #1 from AuthMe-Team/master
Fork changes
2016-02-23 22:24:29 -03:00
Xephi
f22bc4f395 Check if the connection is not null or already closed 2016-02-23 14:53:29 +01:00
DNx
13982011c7 Merge pull request #108 from AuthMe-Team/spawnloc
Spawn Location
2016-02-23 06:58:19 +07:00
ljacqu
5e16ca1490 #392 Create integration test for MySQL
- Relocate tests to AbstractDataSourceIntegrationTest to reuse tests for SQLite and MySQL
- Add H2 driver and create test class for MySQL
2016-02-22 21:52:10 +01:00
ljacqu
44e2218ada Merge pull request #111 from AuthMe-Team/542-lastlogin-to-bigint
#542 Revert lastlogin column from timestamp to bigint
2016-02-22 21:42:40 +01:00
ljacqu
b6384da540 #542 Revert lastlogin column from timestamp to bigint
- While the timestamp type better represents what we store, we use timestamps internally in AuthMe and had to convert between the timestamp type to a long when communicating with a MySQL database. This ends up being inconsistent with SQLite, which does not support the storage of timestamps and an additional burden as the 0000-00-00 00:00:00 timestamp has a special meaning in MySQL we must otherwise check for before fetching values.
2016-02-22 21:04:01 +01:00
ljacqu
fe057f367b Merge pull request #110 from AuthMe-Team/roinuj
Make "use other case" translatable (adjustment)
2016-02-22 20:37:43 +01:00
ljacqu
32159861d3 Update validation of message resources 2016-02-22 20:36:17 +01:00
ljacqu
72cf294056 Allow retrieval of messages with tag replacement 2016-02-22 20:32:44 +01:00
Edson Passos
bfc8058b03 Make "user other case" translatable
(cherry picked from commit ed5498e)
2016-02-22 20:23:30 +01:00
DNx5
5943537c26 cleanup
It's good now
2016-02-22 22:48:02 +07:00