Commit Graph

1355 Commits

Author SHA1 Message Date
DNx5
fda7822644 Merge please 2015-12-05 03:45:52 +07:00
DNx5
93484a3449 Merge remote-tracking branch 'origin/master' into authme-process
Conflicts:
	src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java
	src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
	src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
	src/main/java/fr/xephi/authme/settings/Settings.java
2015-12-05 03:23:50 +07:00
Xephi
e781115d7c Change from mailText to a dedicated file email.html 2015-12-04 17:57:10 +01:00
Xephi
8336dc848e Fix #301 2015-12-04 17:24:56 +01:00
Xephi
0d1cf8c7e2 Idk how it can be null, but well ... 2015-12-04 17:17:35 +01:00
Gabriele C
a1f963adf8 update hikari 2015-12-04 13:23:17 +01:00
ljacqu
1fbe4e0c3b #298 Change password shows wrong 'pw cant be username' error
- Change MessageKey to the proper message
- Change permissions for admin changepassword to admin
- Rename player changepassword command arguments to reflect their actual meaning
2015-12-03 22:07:18 +01:00
ljacqu
cafad5b088 Fix #296 Reloading doesn't update settings
- Replace Settings to encapsulate a YamlConfiguration instance provided by AuthMe, rather than loading the config file again.
2015-12-02 21:42:39 +01:00
Gabriele C
75d4f73f3e Update team.txt 2015-12-02 16:41:32 +01:00
Xephi
a18ea851be Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded.git 2015-12-02 16:34:43 +01:00
Xephi
41b6b4184e Remove StackTrace for production 2015-12-02 16:34:28 +01:00
Gabriele C
42416c4bdc Update config.yml 2015-12-02 16:28:00 +01:00
DNx
b7ede1458e Merge pull request #77 from AuthMe-Team/db-improve
MySQL improvement
2015-12-02 06:44:34 +07:00
DNx5
ee3fe45d7f Fix unclosed Statement object. 2015-12-02 06:36:41 +07:00
DNx5
35d73b2d4a Mysql Improvements.
* Contains lot of changes
2015-12-02 06:29:43 +07:00
DNx5
a8f3a441d5 Lowercase PlayerAuth nickname in constructor and setter. 2015-12-02 04:53:12 +07:00
DNx5
69361de262 Merge remote-tracking branch 'origin/db-improve' into db-improve 2015-12-02 04:48:30 +07:00
ljacqu
923020bf07 Reduce duplication in Log filter implementations 2015-12-01 22:17:18 +01:00
DNx5
8d9e212b15 Improve register process.
* Removed double check for email settings
* Use builder for PlayerAuth
* Handle exceptions in process method
2015-12-02 04:14:18 +07:00
DNx5
3d8e63699d Merge branch 'db-improve' into authme-process 2015-12-02 04:11:21 +07:00
DNx5
e02af46d65 Lowercase the name input. 2015-12-02 04:10:56 +07:00
ljacqu
b0e619d412 Refine JavaDoc and move Log filters to 'output' 2015-12-01 21:53:18 +01:00
ljacqu
690a8d67a3 Abstract Messages into two layers; move to new 'output' package
- Abstract Messages into two layers: the top layer 'Messages' is how Messages can be retrieved and sent as before. In the background, package-private, MessagesManager actually does the file read and worries about I/O while Messages takes care of higher-level things (such as joining two lines or checking the current language).
2015-12-01 21:45:02 +01:00
DNx5
7ec79afe4a Set speed into 0.0 2015-12-02 03:22:27 +07:00
Tim Visée
2550e04112 Fixed player permission tests, improved test structure consistency 2015-12-01 16:44:49 +01:00
Tim Visée
7ac39d80fd Fixed admin permission tests 2015-12-01 16:40:00 +01:00
Tim Visée
ccb9e24ce5 Fixed invalid permission reference. 2015-12-01 16:35:28 +01:00
Tim Visée
a0ed554514 Moved permission from player to admin space 2015-12-01 16:34:54 +01:00
Tim Visée
3d0bf674bd Added JavaDocs to PlayerPermission class, fixed various permission nodes 2015-12-01 16:34:22 +01:00
Tim Visée
42cebacd60 Added JavaDocs to AdminPermission class 2015-12-01 16:29:47 +01:00
Tim Visée
4afef9714d Converted two commands to use the builder 2015-12-01 16:24:24 +01:00
Tim Visée
999c08956d Changed 'changemail' permission to keep the nodes consistent 2015-12-01 16:20:21 +01:00
Tim Visée
369a7ccd65 Lowercase'd player permission node 2015-12-01 16:19:39 +01:00
Tim Visée
fdc747d007 Refactored player permissions enum, to make the name suit better 2015-12-01 16:19:05 +01:00
Tim Visée
7f54838ad4 Rebased player command permission nodes 2015-12-01 16:18:16 +01:00
Tim Visée
8bea153005 Rebased administration command permission nodes 2015-12-01 16:17:37 +01:00
Tim Visée
3b9b1b7b8a Refactored name of command builder, to specify it a little better 2015-12-01 16:14:59 +01:00
Gabriele C
00c6b17f3e Add customizable anto bot message 2015-12-01 15:42:02 +01:00
DNx5
ececba2858 Merge branch 'authme-process' into db-improve 2015-12-01 16:25:17 +07:00
DNx5
92f57090be Set default value for the Builder 2015-12-01 16:07:58 +07:00
DNx5
23e01c8b26 Create builder for PlayerAuth. 2015-12-01 12:19:13 +07:00
DNx5
2fdd5ef325 Handle country blacklist effectively 2015-12-01 02:36:44 +07:00
DNx5
37b24d4e72 Fix "new config options message" always printed on reload. 2015-12-01 02:17:07 +07:00
DNx5
8a6ab3edb5 Setup unrestricted names into lowercase. 2015-12-01 02:14:28 +07:00
DNx5
e387a801f7 Removed some unnecessary player check. 2015-12-01 02:06:51 +07:00
DNx5
d692530035 Moved is player can connect check into prelogin event. 2015-12-01 01:35:30 +07:00
DNx5
029214c080 Fix npe after register. 2015-12-01 01:29:56 +07:00
Xephi
174ad3b29c Fix Conflict 2015-11-30 19:21:15 +01:00
Xephi
a262b26451 Merge branch 'ljacqu-pruuid_bug' 2015-11-30 19:13:12 +01:00
Xephi
3b1c8cd2e4 fix conflict 2015-11-30 19:10:50 +01:00