Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-12-24 01:27:35 +01:00
Code Issues Projects Releases Wiki Activity
2,077 Commits 47 Branches 8 Tags 102 MiB
590532e557
Commit Graph

2077 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gabriele C
dee194b4db move samples into a proper directory 2016-02-11 11:01:43 +01:00
Gabriele C
0a49616b5a Merge pull request #98 from nathampa0909/patch-2 
Update messages_br.yml
 2016-02-11 07:48:00 +01:00
Nathan Guedes
ccc6aa55cf Update messages_br.yml 2016-02-11 00:48:21 -02:00
Gabriele C
e1b7303f61 Spaces please! + we need to shade gson because we are using version 2.5, bukkit's one is 2.2.4 (api conflicts)! 2016-02-10 22:43:28 +01:00
games647
7dc67d7992 Merge origin/master 2016-02-10 22:23:37 +01:00
games647
0cb0bbcd37 Don't relocate libraries that are available in spigot 2016-02-10 22:22:53 +01:00
ljacqu
806fd4731e Update readme to refer to AuthMe-Team/AuthMeReloaded 
- Updated various "build badges" to display data for the AuthMe repository of AuthMe-Team
- Move Gource video a little down
- Mention support of IPB4 in readme and config
 2016-02-10 21:52:11 +01:00
ljacqu
b8e2f5fe1d Use RandomString for IPB4 implementation; minor documentation 
- Improve RandomString and create new generateLowerUpper method
- Add documentation to the IPB4 class to explain why the salt is stored twice
 2016-02-10 21:16:12 +01:00
games647
ee962bce11 Add missing imports -> fixes building finally 2016-02-10 18:52:34 +01:00
games647
225df4f9c9 Add missing imports -> fixes building finally 2016-02-10 18:51:15 +01:00
games647
248ea2666b Fix correct package declaration -> Fixes building 2016-02-10 18:48:04 +01:00
ljacqu
a16f6ae2d0 Add IPB4 to hash algorithm enum 2016-02-10 18:28:04 +01:00
ljacqu
cb50f7b8c4 Minor - move IPB4 to correct package 2016-02-10 18:23:30 +01:00
Gabriele C
62d55a512e Update geoip library 2016-02-10 13:56:56 +01:00
Gabriele C
0f13206a75 Provide a jar with shaded guava! 
Fix #505 #467
 2016-02-09 21:31:17 +01:00
Gabriele C
07e5a67ad5 Merge pull request #97 from AuthMe-Team/ipb4 
IPB4 Support
 2016-02-09 00:14:24 +01:00
DNx5
8e38384a0d Implement the encryption method and test unit. 2016-02-09 05:58:59 +07:00
DNx5
9959c0f7d5 Cleanup BCryptService class 2016-02-09 05:04:29 +07:00
DNx5
600c70ad9f Create new class for IPB4 encryption method. 2016-02-09 04:48:12 +07:00
Gabriele C
e5fd0d2025 Fix pex dependency 2016-02-07 23:21:34 +01:00
Gabriele C
8c68d7e59e Ad jitpack badge 2016-02-07 23:18:54 +01:00
Gabriele C
49e6b309ab Fix test 2016-02-07 22:41:22 +01:00
Gabriele C
960723e13d FIx twice javadoc generation 2016-02-07 22:26:29 +01:00
Gabriele C
eee594543b Disable pex repo, now pex is hosted on our jenkins server. 2016-02-07 22:11:10 +01:00
Gabriele C
dd54de4826 Try to fix pex repo 2016-02-07 22:00:58 +01:00
Gabriele C
4d057cf05d Fix unit test 2016-02-07 18:17:11 +01:00
Gabriele C
2f2af829b0 Fix event listener priorities 2016-02-07 15:35:02 +01:00
ljacqu
db4d4a7cce #477 Change lastlogin column from bigint to timestamp (work in progress) 
- Alter column type
- Create migration for MySQL
- Unrelated: move DataSource enum to its own file
 2016-02-07 14:27:03 +01:00
Gabriele C
9cf7405f63 Merge pull request #96 from Maxetto/patch-1 
Updating IT Language
 2016-02-07 13:08:53 +01:00
games647
d3d377ca02 Do not require a password on registration if two factor is enabled 2016-02-07 11:36:02 +01:00
Maxetto
f581cd5dc6 Update messages_it.yml 2016-02-07 03:48:52 +01:00
Gabriele C
cb27d46e4e Merge pull request #95 from games647/2fa 
[NEEDS TESTING] Add 2fa support Fixes Xephi/AuthMeReloaded#87
 2016-02-07 02:57:21 +01:00
games647
6a75184ad9 Add 2fa support 2016-02-07 00:49:18 +01:00
Gabriele C
31c3588378 Ok, sudo sudo delete everything xD 2016-02-06 23:33:02 +01:00
Gabriele C
e1ccc3ade3 Ok, let's try with this: "sudo update everything and shut up"! xD 2016-02-06 23:29:34 +01:00
Gabriele C
3fdbcad995 Disable travis cache 2016-02-06 23:22:24 +01:00
Gabriele C
5a256cc49d Fix captcha placeholder in messages_br.yml 2016-02-06 23:17:11 +01:00
Gabriele C
b090a2fa2b Merge pull request #91 from nathampa0909/patch-1 
Updated messages_br.yml.
 2016-02-06 23:13:34 +01:00
Gabriele C
a6ef5ad0ac Update Javadoc Location 
(I know that this is a duplicate of a commit on the main repo but people should start using latest docs instead of the old ones)
 2016-02-06 23:10:25 +01:00
ljacqu
8d9a287315 Merge pull request #93 from AuthMe-Team/437-add-email 
437 add email
 2016-02-06 21:59:43 +01:00
ljacqu
2cd2b48a1a #437 Email uniqueness in admin command; finalization 
- Check also in admin command that email is not already used
- Misc bug fixing (logic errors, changes lost during large merge)
- Use "email" and "setemail" as main labels for /authme subcommands
 2016-02-06 21:56:08 +01:00
ljacqu
b4b679d3b9 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 437-add-email 
Conflicts:
	src/main/java/fr/xephi/authme/datasource/MySQL.java
	src/main/java/fr/xephi/authme/datasource/SQLite.java
	src/main/java/fr/xephi/authme/process/Management.java
	src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java
 2016-02-06 18:01:23 +01:00
ljacqu
ad9625bb4e Merge pull request #92 from AuthMe-Team/450-new-settings-rewrite 
450 new settings rewrite
 2016-02-06 17:27:40 +01:00
ljacqu
92f81c32c9 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 450-new-settings-rewrite 2016-02-06 17:17:45 +01:00
ljacqu
99b7b80f1d #450 Fix copying of JAR files to plugin folder 
- Create SettingsMigrationService#copyFileFromResource (inspired from CustomSettings)
- Use new method to copy missing files in plugin folder from JAR
- Create YamlFileConfiguration inside NewSetting: FileConfiguration object provided by JavaPlugin#getConfig() sets default values from the JAR's config.yml :(
- Change ConsoleLogger to take logger from plugin (work in progress)
 2016-02-06 17:10:00 +01:00
Nathan Guedes
37fce732f7 Updated messages_br.yml. 
I put accents and I did a new translation better than old.
 2016-02-06 12:21:16 -02:00
games647
9a07cadaa4 Re add bukkit version variable 2016-02-06 14:12:46 +01:00
games647
aff6858251 Change to spigot's repository link to https to fix building (fixes #451) 2016-02-06 14:08:34 +01:00
Gabriele C
1205a86cd2 Disable "must register" message if the interval is <= 0 2016-02-06 13:52:06 +01:00
ljacqu
85868ca830 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 450-new-settings-rewrite 
Conflicts:
	src/main/java/fr/xephi/authme/AuthMe.java
	src/main/java/fr/xephi/authme/settings/Settings.java
	src/main/java/fr/xephi/authme/settings/custom/NewSetting.java
 2016-02-05 23:28:16 +01:00