3216 Commits

Author	SHA1	Message	Date
DNx5	b0fc123229	replace cache with Json	2015-09-13 22:10:41 +07:00
DNx5	cb59f44b9b	Merge remote-tracking branch 'origin/master' ... Conflicts: src/main/java/fr/xephi/authme/AuthMe.java	2015-09-13 22:09:12 +07:00
DNx5	576ff59fcd	replace cache with Json	2015-09-13 22:08:18 +07:00
Gabriele C	f297609818	cleanup	2015-09-13 17:07:07 +02:00
DNx5	851eab2fd0	cleanup Utils.java	2015-09-13 21:57:36 +07:00
Gabriele C	680717dbca	Fix	2015-09-13 16:28:47 +02:00
Gabriele C	3cbc7ab18f	should fix item usage issue	2015-09-13 15:18:22 +02:00
Gabriele C	76b4f62e79	cleanup	2015-09-13 15:01:22 +02:00
Gabriele C	d8c2a25116	Working sqlitehikari! ;D	2015-09-13 12:25:12 +02:00
Gabriele C.	b2234b1e0d	Merge pull request #44 from DmitryRendov/team ... Fixed PBKDF2DJANGO hash map	2015-09-13 12:12:51 +02:00
DmitryRendov	023e64c8d5	Fixed PBKDF2DJANGO hash map	2015-09-13 09:59:30 +00:00
Gabriele C.	c485a58036	Update MySQL.java	2015-09-12 11:53:30 +02:00
Gabriele C	d4cf739081	Fix hikari	2015-09-10 19:56:33 +02:00
Gabriele C.	639a0482c2	Merge pull request #43 from DNx5/master ... improve inventory cache method (EXPERIMENTAL)	2015-09-10 12:11:10 +02:00
DNx5	08d72785b4	improve inventory cache method	2015-09-10 13:29:11 +07:00
Gabriele C	08c77b6483	Cleanup	2015-09-09 20:21:45 +02:00
Gabriele C.	0180b2210c	Merge pull request #42 from DNx5/master ... cleanup & improvements	2015-09-08 20:49:29 +02:00
DNx5	afeb359b73	cleanup & improvements	2015-09-09 01:28:27 +07:00
Gabriele C	46002b95e3	Cleanup	2015-09-08 18:12:31 +02:00
Gabriele C	c1d56d5ee5	Fix hikari for mysql and sqlite	2015-09-08 17:33:52 +02:00
Gabriele C.	e2b3c51cab	Update MySQL.java	2015-09-08 16:49:47 +02:00
vanhec_a	cbca79f1a4	Fix bad async call	2015-09-08 11:43:32 +02:00
Gabriele C	c0eb15ee49	Cleanup	2015-09-07 20:38:29 +02:00
DNx5	90c7187bab	run task async, fix #200	2015-09-07 23:28:15 +07:00
DNx5	5a9c6278b6	Merge branch 'master' of git://github.com/AuthMe-Team/AuthMeReloaded into AuthMe-Team-master ... Conflicts: src/main/java/fr/xephi/authme/datasource/MySQL.java	2015-09-07 20:49:10 +07:00
Gabriele C	65bb488f4c	PBKDF2DJANGO Hash	2015-09-07 14:30:56 +02:00
Gabriele C	7d8ef95a22	Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded	2015-09-07 14:06:29 +02:00
Gabriele C	84b5dcc625	Cleanup	2015-09-07 14:05:50 +02:00
Gabriele C.	8ec497a5e8	Update AuthMe.java	2015-09-07 13:25:40 +02:00
Gabriele C.	284909a215	Merge pull request #39 from Xephi/master ... Up	2015-09-07 13:23:18 +02:00
Alexandre Vanhecke	1e9d7f879a	Sponsor	2015-09-07 12:35:49 +02:00
Gabriele C.	3032608f6a	Merge pull request #38 from DmitryRendov/master ... Hash update	2015-09-06 23:59:03 +02:00
DmitryRendov	7c2649abf5	Fix	2015-09-06 20:32:58 +00:00
DmitryRendov	495dd35b48	Updated PBKDF2 hasher to support Django 1.7+	2015-09-06 20:28:25 +00:00
DNx5	200ff01cd9	never return null, just throw exception.	2015-09-06 22:24:23 +07:00
Gabriele C	3926faeb35	Fix Hikari timeouts	2015-09-06 13:51:35 +02:00
Gabriele C	1f66a7474d	Stuff! + HikariCP Log4J	2015-09-05 00:45:48 +02:00
Gabriele C	63889c030a	fix conflict	2015-08-28 23:21:22 +02:00
Xephi59	3bcaa3f12b	Change to minimum lifeTime	2015-08-28 00:16:49 +02:00
Xephi59	e33ebb7379	Change some custom event to let them be async	2015-08-28 00:16:26 +02:00
Xephi59	eec7a7f575	Add SALTEDSHA512 Encryption	2015-08-27 23:28:12 +02:00
Gabriele C	7c9298f096	More unstuble stuff! (Now it compiles)	2015-08-27 00:21:53 +01:00
Gabriele C	568784a8e1	test new mysql (not working yet)	2015-08-26 22:52:23 +01:00
Gabriele C	fd063b17e2	fix conflict	2015-08-26 22:43:07 +01:00
Xephi59	3ce87f1710	Fix	2015-08-26 19:01:39 +02:00
Xephi59	fa6e048c21	Fix DriverClassName not properly set	2015-08-26 18:55:33 +02:00
Gabriele C.	c61568e900	Merge pull request #33 from Xephi/master ... Up	2015-08-22 16:35:07 +02:00
Gabriele C	217c217d13	Stuff	2015-08-22 16:34:06 +02:00
Xephi59	c7a711d0b2	Add Try/catch to DataSource close	2015-08-22 15:30:17 +02:00
Gabriele C	c12e24d0f8	Added stacktraces to find out what's the problem -_-	2015-08-21 23:35:44 +02:00