Commit Graph

1191 Commits

Author SHA1 Message Date
Gabriele C.
bbff450225 Merge pull request #9 from Xephi/master
Up
2015-07-20 09:48:30 +02:00
Xephi59
a89c5c7668 Merge branch 'master' of https://github.com/Xephi/AuthMeReloaded 2015-07-20 02:41:25 +02:00
Xephi59
480db6816f Synax 2015-07-20 02:41:14 +02:00
Alexandre Vanhecke
fa4ff43641 Merge pull request #133 from AuthMe-Team/master
Merge stuff from the team.
2015-07-19 18:11:31 +02:00
Maxetto
1760461518 Update Settings.java
Returning the method if file is NOT found.
2015-07-19 01:37:22 +02:00
Maxetto
ea7b470c31 Update Messages.java
Returning the method if file is NOT found.
2015-07-19 01:36:36 +02:00
Gabriele C
00da050f4c moved prototype files 2015-07-18 23:08:47 +02:00
Gabriele C
1bde8729ee I hope I didn't made only shit (pls check this) 2015-07-18 21:57:26 +02:00
Gabriele C.
edd77fe0a6 Update messages_de.yml 2015-07-18 20:27:35 +02:00
Gabriele C.
db15afbab7 Merge pull request #7 from Trojaner25/patch-2
Update german translation (add missing translations)
2015-07-18 20:25:04 +02:00
Gabriele C.
aae94a29b8 Merge pull request #6 from Xephi/master
Encoding depend on OS
2015-07-18 17:02:18 +02:00
Xephi59
663c4a48d1 Encoding depend on OS 2015-07-18 16:52:14 +02:00
Gabriele C
b95795f2c6 added a converters little documentation (prototype) 2015-07-18 15:58:09 +02:00
Trojaner
d433b7d0f8 Update german translation (add missing translations) 2015-07-18 16:54:14 +03:00
Gabriele C
7142ed845b Moved Email settings 2015-07-18 15:23:33 +02:00
Gabriele C.
61abee86b0 This was useless... 2015-07-18 15:07:36 +02:00
Gabriele C.
32063bc760 Update messages_en.yml 2015-07-18 15:02:23 +02:00
Maxetto
8906738ca9 Update messages_en.yml
- unknown_user casts when no record is found in the database, therefore hasn't even connected to the server.
- pl(e)ase
- user_reddeg casts when trying to register after having already registered the name. We must then use it at 2nd person.
- I personally didn't like the new "password_error"
2015-07-18 14:51:13 +02:00
Gabriele C.
6966fa4faa Update messages_en.yml 2015-07-18 14:33:44 +02:00
Gabriele C.
d980ffa34f Update README.md 2015-07-18 01:07:34 +02:00
Gabriele C.
3d1cc3a321 Update README.md 2015-07-18 01:07:06 +02:00
Gabriele C
ebacf5e164 No colors! 2015-07-18 00:02:48 +02:00
Gabriele C.
77c2fbd7a7 Update README.md 2015-07-17 21:18:07 +02:00
Gabriele C.
0596eaed6c Update README.md 2015-07-17 21:13:23 +02:00
Gabriele C.
8f3c3eb7f3 Merge pull request #5 from Xephi/master
Up
2015-07-17 20:47:06 +02:00
Xephi59
b60daae936 Sync this 2015-07-17 20:35:01 +02:00
Gabriele C.
769da9dbbe Update README.md 2015-07-17 19:02:23 +02:00
Alexandre Vanhecke
5966bee536 Merge pull request #129 from AuthMe-Team/master
Readme stuff
2015-07-16 23:45:17 +02:00
Gabriele C.
15e5379760 Update README.md 2015-07-16 22:56:44 +02:00
Gabriele C.
d4c9a0c5bf Merge pull request #4 from sgdc3/master
Readme stuff
2015-07-16 22:49:58 +02:00
Gabriele C.
b3337abeb7 Update README.md 2015-07-16 22:49:00 +02:00
Gabriele C.
80d216661f Update README.md 2015-07-16 22:47:55 +02:00
Alexandre Vanhecke
af0ec63c2c Merge pull request #128 from AuthMe-Team/master
Readme + Console strings stuff
2015-07-16 22:35:22 +02:00
Gabriele C.
d808c12f2c Started readme rework 2015-07-16 22:21:59 +02:00
Gabriele C
c3c90e8d76 Fixed ZHTW translation 2015-07-16 21:37:00 +02:00
Gabriele C
02843b6a6d Fixed logger 2015-07-16 21:27:28 +02:00
Gabriele C
5f5c1b19f0 Enhanced console messages 2015-07-16 21:16:58 +02:00
Gabriele C.
0ab801daa7 Update README.md 2015-07-15 23:43:56 +02:00
Gabriele C.
d363764169 Update README.md 2015-07-15 20:46:36 +02:00
Gabriele C.
a4da30fcf4 Update README.md 2015-07-15 18:55:16 +02:00
Alexandre Vanhecke
6a3c5f9b79 Merge pull request #125 from AuthMe-Team/master
License stuff
2015-07-15 18:44:39 +02:00
Gabriele C.
22619b39bb Merge pull request #3 from Xephi/master
Up
2015-07-15 18:43:19 +02:00
Xephi59
94b84d30fd remove useless repo 2015-07-15 18:38:43 +02:00
Xephi59
bf8ad3f1d6 Forgot this too 2015-07-15 18:30:10 +02:00
Xephi59
8037da0fa8 forgot to remove that 2015-07-15 18:29:25 +02:00
Xephi59
e9308bb231 Fix Inventory Loss + Timeout timings 2015-07-15 18:21:06 +02:00
Gabriele C.
f03bcc68af Merge pull request #2 from Xephi/master
Up
2015-07-15 18:07:44 +02:00
Xephi59
0fbf57cf1a Don't Wait ! 2015-07-15 18:05:17 +02:00
Gabriele C
1b36f495f2 Replaced license with the default Apache 2.0 file 2015-07-15 17:18:44 +02:00
Maxetto
9787fbb105 Merge pull request #1 from Xephi/master
Syncing
2015-07-14 20:29:03 +02:00