DNx5
a14e3260dc
Merge branch 'db-improve'
...
Conflicts:
src/main/java/fr/xephi/authme/settings/Settings.java
2015-12-11 21:47:19 +07:00
DNx5
cd1c861b47
Bungee message update, whatever.
2015-12-11 12:16:29 +07:00
Gabriele C
1ecee76b60
clean imports
2015-12-10 20:53:46 +01:00
Xephi
50c18c4093
Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded.git
2015-12-10 20:45:53 +01:00
Xephi
dff4e6d135
Use ByteStreams from Guava
2015-12-10 20:45:46 +01:00
ljacqu
a6588318c2
Fix spelling in main readme
...
- Fix spelling errors
- Remove mention of non-existent permission node "authme.*"
2015-12-10 20:39:31 +01:00
ljacqu
52b61b10f6
Tools: Remove I/O without user confirmation, minor refactoring
...
- Permissions: Do not write to generated file without explicit consent by user (default behavior of runners should be _not_ to do any I/O)
- Fix wrong check in messages; minor output adjustment
- Remove hacky check to see if last char of a file is a new line
2015-12-10 20:24:20 +01:00
ljacqu
3253b43a63
Merge branch 'messages-verifier' of https://github.com/AuthMe-Team/AuthMeReloaded
2015-12-10 19:53:23 +01:00
ljacqu
37d769a3ce
Add missing keys to messages file
2015-12-10 19:51:29 +01:00
ljacqu
f5583f4435
Manual messages fixes; refine messages verifier
...
- Add messages with new line to same line with &n
- Add German translation for missing key
- Adjust messages filename pattern to include Chinese files (with 4-letter codes)
- Change verifier to only output errors (more "to-the-point" output)
2015-12-10 19:42:19 +01:00
ljacqu
c50c9efe83
Refine messages file verifier
...
- Fix minor open issues
- Add documentation
- Rename to [hopefully] more suitable names
2015-12-10 19:31:56 +01:00
ljacqu
186ef965ca
Message files verifier - refactoring
...
- Separate logic from output (still potential for improvement)
- Prompt user for options (single file mode / write missing keys or not)
2015-12-10 19:18:05 +01:00
Xephi
12de593ec4
Add an info in console when player login from other server
2015-12-10 18:48:22 +01:00
Xephi
75084e62ec
[PREV COMMIT] If we set a custom channel, maybe listen at it :')
2015-12-10 18:36:31 +01:00
Xephi
3975e65655
[DEV] [BungeeCord] Fix reading data
2015-12-10 18:34:50 +01:00
Xephi
1ce4a11147
[PREV COMMIT] Oops, it's logout here :D
2015-12-10 18:32:41 +01:00
Xephi
d01713a2f5
[DEV] [NEED TEST] BungeeCord
...
Add a way to send player login on other AuthMe instance through
BungeeCord plugin channel
2015-12-10 18:31:46 +01:00
ljacqu
5b92b30a96
Revert sorting of messages
...
- Comments in the files were out of order and then removed manually. Sorting will therefore be done in a comment-friendly way in Java
2015-12-10 18:15:46 +01:00
ljacqu
935e9892c4
Tools - Create message files verifier (work in progress)
...
- Create utility to test the message files for any unknown or missing message keys
2015-12-10 18:11:31 +01:00
Gabriele C
9c86fbd8bf
cleanup listener class
2015-12-10 15:44:24 +01:00
Gabriele C
9cbe57015e
Update gson
2015-12-10 15:28:40 +01:00
Xephi
e99161f3ac
Add Shell script to sort file content
2015-12-09 16:43:27 +01:00
Xephi
30f4a00e3b
One left
2015-12-09 14:54:05 +01:00
Xephi
7d7cf0909f
Fix latest commit
2015-12-09 14:53:24 +01:00
Xephi
c3d724ebce
Sort messages.yml file
2015-12-09 11:35:29 +01:00
Xephi
49da659d93
Add SH Helpers tools
2015-12-09 11:15:09 +01:00
Xephi
dcd06760ce
Display a message on bad email.html
2015-12-09 10:38:41 +01:00
Alexandre Vanhecke
9233fbfb04
Merge pull request #81 from Xephi/master
...
Merge pull request #289 from AuthMe-Team/master
2015-12-09 10:31:32 +01:00
Alexandre Vanhecke
8fe0006ef5
Merge pull request #289 from AuthMe-Team/master
...
[DO NOT MERGE] Merge from AuthMe-Team
2015-12-09 10:30:43 +01:00
ljacqu
6a503772e2
Close Scanner in tools/permissions; make use of more generic services
...
- Close scanner for all cases
- Replace read from file with the one from the File service
- Rename file service class to FileUtils to better reflect its purpose
2015-12-08 22:08:22 +01:00
ljacqu
0710c4f531
Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into commands-refactor
2015-12-08 21:58:35 +01:00
ljacqu
595879b95e
#307 Finish changes to incomplete solution ( f40d75e)
...
- Remove deprecated builder
- Fix introduced typos
2015-12-08 21:51:33 +01:00
Gabriele C
330a275725
Bump version: too many changes
2015-12-08 21:02:22 +01:00
Gabriele C
e4fbe4ec53
Fix npc issues ( #320 )
...
This will fix 1 bug..... and will generate new ones! :P
2015-12-08 20:52:45 +01:00
Gabriele C
6ee07160bb
cleanup and update deps
2015-12-08 20:07:10 +01:00
DNx5
6f040fe8ac
Added permission check for vip login. Fix #323
2015-12-07 19:59:26 +07:00
DNx5
a91ad46659
Merge remote-tracking branch 'origin/master'
2015-12-07 19:58:19 +07:00
Xephi
a212a0c0fd
Fix Captcha count
2015-12-06 11:08:33 +01:00
Xephi
9236c1fb12
Fix Build, my bad, sorry
2015-12-06 05:30:28 +01:00
Gabriele C
06b7ad88d5
console mode during mvn build
2015-12-06 01:44:48 +01:00
ljacqu
d059d4f00d
Fix possible NPE - permissions in CommandDescriptions can be null
...
- Fix missed null situation during previous code changes
2015-12-06 01:13:12 +01:00
ljacqu
22ad305506
Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into commands-refactor
2015-12-06 00:52:34 +01:00
ljacqu
d5a1af0380
Add bat helpers to tools
2015-12-06 00:40:11 +01:00
DNx5
7ba54123db
Update PlayerAuth builder class.
2015-12-06 06:14:30 +07:00
DNx5
c196f45854
Change getAccountsRegistered method to use normal Statement.
...
- Log the stacktrace if something weird happens.
2015-12-06 06:12:45 +07:00
DNx5
1f001f2225
Removed max mysql connections options from config.
2015-12-06 06:10:16 +07:00
DNx5
45c6bf0a78
Removed DatabaseCalls class.
...
* this class only contains wrapper of selected datasource type which every method included a code to run the task inside a new Thread. But this class doesn't help improving performance, because it's still running the task synchronously.
2015-12-06 06:08:52 +07:00
ljacqu
af9078c24b
Merge branch 'allow-global-perms' of https://github.com/AuthMe-Team/AuthMeReloaded
2015-12-05 23:56:54 +01:00
ljacqu
d3edbbcb49
#285 #319 Add support for wildcard permissions
...
- Fix accidental recursive call
2015-12-05 23:55:58 +01:00
ljacqu
63a7cd00df
#285 #319 Add support for wildcard permissions
...
- Add wildcard attribute to permission nodes that are checked additionally in the permissions manager
2015-12-05 23:33:09 +01:00
