Commit Graph

2301 Commits

Author SHA1 Message Date
Gabriele C
9ec404d51f Merge pull request #332 from AuthMe-Team/master
[Partial] Stuff from DEV repo in realtime
2016-02-20 14:47:20 +01:00
ljacqu
511f961d29 #534 Get default messages from the JAR's messages_en.yml
- Using new File(class.getResource(path)) apparently is the wrong approach for in-JAR files
2016-02-20 12:12:24 +01:00
DNx5
b66c4983ec Merge branch 'master' into reload-supp 2016-02-20 17:52:37 +07:00
ljacqu
8511a257ed #494 Fix conversion plaintext to SHA256
- Make sure database is set up before attempting to perform the migration
2016-02-20 11:16:25 +01:00
ljacqu
fd89915071 #517 Display welcome message for all logins 2016-02-20 08:23:02 +01:00
ljacqu
614d544edf #534 Send error if name is restricted (this time for real) 2016-02-20 07:26:58 +01:00
ljacqu
374113ff01 #534 Send error if name is restricted 2016-02-20 07:25:14 +01:00
DNx5
757f231ceb more ProtocolLib reload support. 2016-02-20 10:24:45 +07:00
DNx5
fd12efa2c0 Merge branch 'master' into cache 2016-02-20 09:48:27 +07:00
DNx5
de3fb61e60 Clear timeout & message task on remove. 2016-02-20 09:35:40 +07:00
DNx5
27642dd82c Rename DataFileCache to PlayerData 2016-02-20 09:32:08 +07:00
DNx5
2f75e03275 cache player's flying enabled state. 2016-02-20 08:56:08 +07:00
DNx5
cc29d8b628 Fix duplicate entry error, #528 2016-02-20 06:47:59 +07:00
ljacqu
90e0dc1875 Various code householding
- Remove unused API on DataSource
- Add some sensible javadoc to DataSource
- Minor code simplification
2016-02-19 23:19:38 +01:00
ljacqu
6f694cf818 #527 Persist email after changing it 2016-02-19 21:48:51 +01:00
ljacqu
964abdc0c5 Update add email tests (#527) 2016-02-19 19:26:16 +01:00
ljacqu
5795b9d8fd #533 Add integration sample for BCrypt 2016-02-19 19:14:12 +01:00
DNx5
05e79e6356 Fix email not getting updated in database #527 2016-02-19 23:26:11 +07:00
DNx5
6dfdcf103b I forget this one, Fix #507 2016-02-19 23:26:09 +07:00
Gabriele C
c11fa9f158 Merge pull request #101 from AuthMe-Team/move-convert-command
Move the converter command [WIP]
2016-02-19 16:49:11 +01:00
Gabriele C
4620ead311 Fix number of commands in test 2016-02-19 16:42:48 +01:00
DNx5
760d2a9fe6 I forget this one, Fix #507 2016-02-19 22:40:37 +07:00
Gabriele C
715622826f Fix command registration 2016-02-19 16:38:18 +01:00
Gabriele C
1714b41657 Update dependencies 2016-02-19 16:30:31 +01:00
DNx
5ea032840d Merge pull request #106 from AuthMe-Team/geoip
Going back to GeoIP legacy. :)
2016-02-19 22:27:28 +07:00
DNx5
edc20debea Going back to GeoIP legacy. :) 2016-02-19 21:55:53 +07:00
DNx5
c3e3bdf3a4 Added getter for newSettings field. 2016-02-18 11:25:31 +07:00
DNx
10fedfb66d Merge pull request #105 from AuthMe-Team/geoip2 2016-02-18 10:43:52 +07:00
DNx
584fe1d67f Merge pull request #103 from AuthMe-Team/realname-update 2016-02-18 10:32:09 +07:00
DNx5
8c08bdb7f9 oops.. 2016-02-18 10:29:40 +07:00
DNx5
cc266a7bd6 Update javadoc. 2016-02-18 09:42:45 +07:00
DNx5
481cbaec2f Don't check the country if nothing defined on configuration.
- no need to enable protection to use country blacklist. #507
2016-02-18 09:34:04 +07:00
DNx5
fbdd56d9de Ignore country check for localhost.
- don't log exception to console
2016-02-18 09:15:43 +07:00
Gabriele C
110ac36bef Merge pull request #104 from AuthMe-Team/geoip2
GeoIP2
2016-02-16 08:43:40 +01:00
DNx5
64688c7ae6 Remove data file if older than 30 days 2016-02-16 09:30:22 +07:00
DNx5
7b8e5f8e4f GeoIP2 update 2016-02-16 08:31:47 +07:00
DNx5
7c1dd888cc Fix real name update. 2016-02-16 07:14:40 +07:00
DNx5
814bc8df4e Improve email recall task. Fix #529 2016-02-16 06:16:49 +07:00
Gabriele C
29cc69407c Merge pull request #102 from ljacqu/bakatrouble
Fix Django crypt (needs testing)
2016-02-14 23:22:36 +01:00
bakatrouble
0992997483 Fix Django crypt
(cherry picked from commit 189f916)
2016-02-14 23:08:51 +01:00
ljacqu
ecc3048f52 Merge master into 'move-convert-command' 2016-02-14 22:32:12 +01:00
ljacqu
f5b5595f08 #525 Make "not owner" kick reason translatable 2016-02-14 21:46:47 +01:00
ljacqu
7f3246e416 #519 #515 #431 Tool task to update all docs; relocate to root/docs
- Move docs from src/tools to a root subfolder
- Add tag for displaying a "generated page" footer
- Create task to run all doc tasks
- Remove map builder in favor of Guava's
2016-02-14 21:43:01 +01:00
Gabriele C
76e7728b37 Don't relocate email dependency atm
Fix https://github.com/Xephi/AuthMeReloaded/issues/522
2016-02-14 19:19:05 +01:00
ljacqu
8c6db4a2c9 Improve logging in SendMailSSL
- for #522
2016-02-14 18:04:10 +01:00
ljacqu
2c9cb6d99a #521 #514 Update zhhk file and add TODO comments for missing messages
TODO comments added automatically by ToolTask verifyMessages
2016-02-14 17:49:58 +01:00
ljacqu
dbd896b462 Improving logging in SQLite 2016-02-14 17:49:56 +01:00
Gabriele C
15792f01e9 Fix docs 2016-02-14 17:38:13 +01:00
Gabriele C
d727def4ba Move the command 2016-02-14 17:06:52 +01:00
ljacqu
2dbcd50eea Merge pull request #100 from AuthMe-Team/415-perms-rework_NEW
#415 Move some permission nodes out of authme.player.*
2016-02-14 16:36:43 +01:00