Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-11-08 03:29:41 +01:00
Code Issues Projects Releases Wiki Activity
1,896 Commits 47 Branches 8 Tags 102 MiB
4e011f437a
Commit Graph

1896 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ljacqu
a103aee4da Addendum - only write to log if specified by settings 
- Commit forgotten removal of `!` during refactoring
 2016-02-05 23:13:09 +01:00
ljacqu
c28a1b537f #495 Create ConsoleLogger method dedicated to logging exceptions 2016-02-05 23:11:38 +01:00
ljacqu
ab719c4204 Minor - remove messages language from old settings 2016-02-05 22:30:57 +01:00
Gabriele C
558cbf5848 Really? -_- 2016-02-05 21:20:15 +01:00
Gabriele C
6495cee079 Add alternative dev build download link! 2016-02-05 21:19:12 +01:00
Gabriele C
717d455a8d Provide also a jar without version number 2016-02-05 21:14:45 +01:00
Gabriele C
f98deff41a Whoops 2016-02-05 20:46:32 +01:00
Gabriele C
f6837bb33a Try to fix circle artifacts, again 2016-02-05 20:42:06 +01:00
Gabriele C
bd3761ad13 Move metrics management to another class 2016-02-05 19:34:54 +01:00
DNx5
190b4c2c2e - Removed executor service and all uses from CachedDataSource. 2016-02-06 00:53:43 +07:00
DNx5
ef89ab02b4 Cleanup imports. 2016-02-05 23:27:34 +07:00
DNx5
c9b884624d - Make cache RemovalListener sync (no longer use executor). 
- Fix #433
 2016-02-05 23:26:46 +07:00
DNx5
05aec0f4fe - Removed code for waiting Bukkit tasks to complete. 2016-02-05 23:18:35 +07:00
Xephi
4f76398ce8 #495 - Done 2016-02-05 13:24:38 +01:00
Gabriele C
e8a9b5c2e2 Add missing setting to the new Settings manager. 2016-02-04 23:00:41 +01:00
Gabriele C
4c265f1879 Add an option to allow unlogged users to run all the commands 
Fix #456
 2016-02-04 15:03:52 +01:00
ljacqu
3e30a34714 #450 Move Settings#loadEmailText and #getWelcomeMessage 2016-02-03 22:36:01 +01:00
Gabriele C
15ca8284f4 Update messages_hu.yml 
Thanks to foxi69
 2016-02-01 23:26:33 +01:00
Gabriele C
11a03e5c46 Update dependencies 2016-02-01 13:24:45 +01:00
ljacqu
d3c1f06efb Update Hungarian messages 
- Thanks to falconhome, via issue #470
 2016-01-31 21:52:03 +01:00
ljacqu
155881ef05 Merge master into '450-new-settings-rewrite' 
Conflicts:
  - PerformBackup.java
  - Settings.java
 2016-01-31 21:32:29 +01:00
ljacqu
42ae30ed3a #450 Move Settings#isEmailCorrect to Utils class 2016-01-31 21:22:19 +01:00
Gabriele C
b299e4be91 Fix missing setting 2016-01-31 19:08:28 +01:00
ljacqu
9653354135 #450 Move Settings#getRestrictedIp() 2016-01-31 18:50:57 +01:00
ljacqu
fbd5265a0b #450 Fix YAML export of enum values 
- Move writing logic to PropertyType
- Remove unused double property type
- Add sample enum property type to tests
 2016-01-31 10:49:30 +01:00
ljacqu
e747dfeb7f #450 Make reload & messages functionality use NewSetting 
- Change ReloadCommand to use the new setting functionality
- Check and construct the messages file in NewSetting
- Unrelated: change MessagesManager not to extend CustomConfiguration anymore
 2016-01-31 09:55:02 +01:00
ljacqu
a40b06344a Minor - remove override of equals() in PropertyMapComparator 
- The Comparator map defines equals(Object) but this is obviously already implemented by the Object superclass
 2016-01-30 15:32:48 +01:00
ljacqu
059175f14e #450 Port usages of Settings#set(), #setValue() to NewSettings 2016-01-30 15:12:26 +01:00
ljacqu
724296e02b #449 Migrate some properties to new settings 
- Use new settings class for retrieving help header & backup configs
- Delete migrated configs from old settings
 2016-01-30 13:19:05 +01:00
Gabriele C
a101ce915b Don't print warning messages if backup on start/stop is disabled. 2016-01-29 20:22:15 +01:00
games647
0b4ddce3c4 Fixes NPE on forceRegister (Fixes #473) 2016-01-28 11:43:08 +01:00