Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-12-30 12:37:34 +01:00
Code Issues Projects Releases Wiki Activity
3,428 Commits 47 Branches 8 Tags 102 MiB
a0080686ac
Commit Graph

3428 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ljacqu
09f403f357 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into configme-integration 
Conflicts:
	pom.xml
 2016-09-04 15:25:58 +02:00
ljacqu
6857bd929e Fix generics in ConverterCommandTest 2016-09-04 15:01:52 +02:00
ljacqu
4df4e823ec Merge remote-tracking branch 'origin/master' 2016-09-04 14:49:21 +02:00
ljacqu
8dfd66d10b Merge branch '933-mysql-to-sqlite-converter' of https://github.com/AuthMe-Team/AuthMeReloaded 2016-09-04 14:48:34 +02:00
Gabriele C
5efed1b697 Bump java version requirement 2016-09-04 14:48:13 +02:00
ljacqu
5930f705f2 Send more precise message when converter type does not exist 2016-09-04 14:47:16 +02:00
Gabriele C
bc9d67abbd Bye bye java 7! 2016-09-04 14:42:50 +02:00
ljacqu
ee5ed13931 Replace enum with map in converter command 2016-09-04 14:23:13 +02:00
Gabriele C
6768f5fdce Relocate the injector 2016-09-04 14:16:35 +02:00
Gabriele C
af4e8acc04 Maven cleanup 2016-09-04 14:04:27 +02:00
ljacqu
589e589e45 #933 Add MySQL to SQLite converter 
- Create common parent for converting from one datasource type to another
- Add MySQL to SQLite child
- Create tests
 2016-09-04 13:59:23 +02:00
Gabriele C
7deb75ab85 Deprecate GroupManager handler 2016-09-04 13:29:01 +02:00
Gabriele C
0aaaa1dda9 Merge remote-tracking branch 'refs/remotes/Xephi/master' 2016-09-04 13:03:53 +02:00
Gabriele C
6e5c901c4b Fix build 2016-09-04 12:58:50 +02:00
eduardo
945c9e9587 Upadate messages_pt.yml 
I update messages in my server and i wanna update to next updates
(cherry picked from commit 12f7faf)
 2016-09-04 11:45:33 +02:00
DNx
b7f4c0d460 Merge pull request #157 from katabamia/master 
Add Japanese translation
 2016-09-04 03:56:15 +07:00
DNx
69e8313771 Merge pull request #936 from Xephi/revert-934-master 
Revert "Translate to Japanese"
 2016-09-04 03:50:40 +07:00
DNx
7b5943c7f1 Revert "Translate to Japanese" 2016-09-04 03:50:07 +07:00
DNx
21212137ba Merge pull request #934 from katabamia/master 
Add Japanese translation.
 2016-09-04 03:49:59 +07:00
katabame
2b07752b4f Add messages_ja.yml 2016-09-04 04:59:34 +09:00
Gabriele C
803653ee0d Add default DeathBot password as unsafe 2016-09-03 15:40:47 +02:00
Gabriele C
e8f0afe6b6 Fix console character 2016-09-03 15:26:19 +02:00
ljacqu
34a2b46768 #927 Fix Settings initialization and failing tests 2016-09-03 11:30:03 +02:00
ljacqu
b8153c2578 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into configme-integration 2016-09-03 10:31:05 +02:00
ljacqu
0d368ef1a2 Revert: Use official bPermissions artifact 
- Since 3ea933ffc6 the Jenkins build has been failing and it is no longer possible to build locally. Now Travis and CircleCI are also failing.
 2016-09-03 10:05:32 +02:00
ljacqu
81c4dd3611 Merge branch 'master' of https://github.com/Xephi/AuthMeReloaded 2016-09-03 10:04:07 +02:00
Gabriele C
9fa5f2beea Mysql CP performance enhancements 2016-09-02 15:48:58 +02:00
games647
23874266d3 Add a note to check for already existing issues 2016-09-02 10:57:50 +02:00
Gabriele C
c6b35688eb Merge pull request #155 from AuthMe/872-use-player-haspermission 
#872 Use Player#hasPermission instead of custom PermissionHandler method
 2016-08-31 22:40:49 +02:00
ljacqu
36dfab636a #927 Update code to recent changes in ConfigMe 2016-08-31 22:19:27 +02:00
ljacqu
dd27ff7daa #872 Use Player#hasPermission instead of custom PermissionHandler method 
- Use Player#hasPermission to check if a player has a permission
- Remove hasPermission method from PermissionHandler implementations
 2016-08-31 21:27:43 +02:00
ljacqu
c7bb7b460e #927 Integrate ConfigMe into AuthMe (work in progress) 
- Replace own code with ConfigMe
 2016-08-30 15:28:07 +02:00
Gabriele C
b07e60a807 Correct UK language code 2016-08-29 13:05:08 +02:00
Gabriele C
8efdbc0fb8 Add UA language #925 2016-08-29 16:15:01 +02:00
Gabriele C
3ea933ffc6 Use official bPermissions artifact 2016-08-29 01:21:40 +02:00
ljacqu
33eab1df21 #876 Make expiration configurable and implement cleanup for old entries 2016-08-28 12:12:46 +02:00
Maxetto
993f3fb236 Language consistency update 
* Must specify the password is inside the email

* Remove "disabled" written twice

* Update messages_it.yml

* Specify THAT email, not an email.

* Consistency update
 2016-08-28 01:45:24 +02:00
ljacqu
f666ea9370 Minor - make ReflectionTestUtils.getFieldValue do the casting directly 2016-08-27 21:30:01 +02:00
ljacqu
2417bf4c3f #876 Keep track of wrong logins by (ip, username) and implement threshold 2016-08-27 21:28:11 +02:00
ljacqu
bfcd28a9a1 Add all passed groups when adding new permission groups (fixes bug in unused code) 2016-08-27 21:27:06 +02:00
ljacqu
e224d62b7e Hashes: make tests faster when 'skip long tests' profile is enabled 2016-08-27 21:26:36 +02:00
ljacqu
f59a584622 Write tests for AsyncUnregister and TaskCloser 2016-08-27 21:26:15 +02:00
Gabriele C
afd4498184 Merge pull request #776 from AuthMe/master 
PRE-BETA 4 STUFF
 2016-08-22 20:19:10 +02:00
Gabriele C
abff2ac6e8 Merge pull request #153 from tuanjr/patch-1 
Update messages_vn.yml
 2016-08-22 20:15:46 +02:00
ljacqu
2f1613840e #736 Remove getter for Management instance on main class 2016-08-20 22:03:11 +02:00
ljacqu
289ce7740f Update injector version and move shutdown logic to separate classes 2016-08-20 21:54:41 +02:00
Gabriele C
14900d84fa Merge pull request #152 from AuthMe/misc-changes 
Misc changes
 2016-08-19 18:31:42 +02:00
DNx5
78708354e1 - Set group to empty if permissions manager has no group support. 
- edited comment for config node "permission.EnablePermissionCheck"
 2016-08-19 18:40:47 +07:00
ljacqu
ceb503469f Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into misc-changes 2016-08-18 17:55:33 +02:00
Gabriele C
9726576907 Merge pull request #151 from Maxetto/patch-4 
Missed a "%"
 2016-08-17 21:54:10 +02:00