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 |
|
Gabriele C.
|
b83d141758
|
Merge pull request #41 from DNx5/master
run task async, fix #200
|
2015-09-07 18:32:27 +02:00 |
|
DNx5
|
90c7187bab
|
run task async, fix #200
|
2015-09-07 23:28:15 +07:00 |
|
Gabriele C.
|
8484ed3e02
|
Merge pull request #40 from DNx5/master
Stuff from DNx5
|
2015-09-07 16:18:20 +02: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.
|
7a82bb7ba8
|
Update team.txt
|
2015-09-07 15:41:22 +02: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.
|
0bab99b2fd
|
Update README.md
|
2015-09-07 13:29:22 +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 |
|
Alexandre Vanhecke
|
395a514778
|
Update README.md
|
2015-09-07 12:33:24 +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 |
|
DNx5
|
0cc98a839c
|
Merge remote-tracking branch 'origin/master'
|
2015-09-06 21:18:58 +07:00 |
|
Gabriele C
|
7f9d641fe3
|
Fix hikari logger
|
2015-09-06 14:16:57 +02:00 |
|
Gabriele C
|
3926faeb35
|
Fix Hikari timeouts
|
2015-09-06 13:51:35 +02:00 |
|
DNx
|
362fd45ace
|
Merge pull request #1 from Xephi/master
Merge https://github.com/Xephi/AuthMeReloaded/tree/master
|
2015-09-06 07:33:04 -04:00 |
|
Gabriele C
|
78d6b9cc6b
|
Ok, it's too complex to use the log4j implementation xD
|
2015-09-05 12:40:36 +02:00 |
|
Gabriele C
|
d13f8fc512
|
Fix build xD
|
2015-09-05 00:50:08 +02:00 |
|
Gabriele C
|
1f66a7474d
|
Stuff! + HikariCP Log4J
|
2015-09-05 00:45:48 +02:00 |
|
Gabriele C
|
6545ad3aea
|
slf4j log4j implementation enhancement
|
2015-09-04 19:49:33 +02:00 |
|
Gabriele C.
|
d9b7ed7c88
|
Merge pull request #37 from Xephi/master
up
|
2015-09-04 19:46:44 +02:00 |
|
Alexandre Vanhecke
|
3963a27c27
|
Update README.md
|
2015-09-04 10:59:55 +02:00 |
|
Alexandre Vanhecke
|
028c70945e
|
Update README.md
|
2015-09-03 15:58:18 +02:00 |
|
Alexandre Vanhecke
|
b6b6b096b8
|
Merge pull request #195 from waffle-iron/master
waffle.io Badge
|
2015-09-03 15:57:23 +02:00 |
|
Making GitHub Delicious.
|
fc484c4948
|
add waffle.io badge
|
2015-09-03 07:56:41 -06:00 |
|
Gabriele C
|
04d222126f
|
Merge branch 'Xephi-master'
|
2015-08-28 23:22:07 +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
|
1e52cd0c30
|
Changed to HikariCP-Log4j
|
2015-08-27 00:39:54 +01: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
|
9445e4c0b5
|
Merge branch 'Xephi-master'
|
2015-08-26 22:43:25 +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.
|
0d11575ca7
|
Merge pull request #34 from Xephi/master
Update pom.xml
|
2015-08-24 14:05:41 +02:00 |
|
Alexandre Vanhecke
|
be3cdaba88
|
Update pom.xml
|
2015-08-24 12:09:54 +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 |
|