440 Commits

Author SHA1 Message Date
sennahLessert
4daa7c643f fix_Issue1620 - add some missing translation keys in DE language 2018-10-03 14:22:09 +02:00
Alberto Maturano
bb66b76087 Improve spanish translation
fix #1621
2018-10-02 22:44:14 -05:00
Pedro Caseiro
403c5d0567 issue #1626: pt translations 2018-10-02 22:53:00 +01:00
Daan De Deckere
a805567c43 Add missing translation keys for NL language. Fixes #2035 2018-10-02 20:41:40 +02:00
Jim LAURIE
03b03deca3 Fix #1784 change error message incorrect code 2018-10-02 20:03:58 +02:00
cyril lopez
ad4919ff82 Merge branch 'master' of github.com:strapi/strapi into fix/1765 2018-10-01 14:31:57 +02:00
cyril lopez
d05f936ff5 Add plugin prefix to plugins routes.
Fixes #1765
2018-10-01 14:29:11 +02:00
Özgür ERSOY
98ed66293a update missing #2037 2018-09-30 12:21:06 +03:00
Jim LAURIE
e98589e130
Merge branch 'master' into master 2018-09-29 14:29:25 +02:00
Jim LAURIE
455077b786
Delete log 2018-09-28 19:43:03 +02:00
cyril lopez
3acec21d68 Add en trad 2018-09-28 12:53:14 +02:00
cyril lopez
d992fd7464 Fixes 1785 2018-09-28 12:52:27 +02:00
Özgür ERSOY
0994b05142 Update TR translations - 2 #1634 2018-09-27 22:53:39 +03:00
Jim LAURIE
1f56c823e9
Merge branch 'master' into order-translation-key 2018-09-27 18:39:22 +02:00
Jim LAURIE
29409f9531
Merge branch 'master' into master 2018-09-27 18:32:03 +02:00
Jim LAURIE
070f398044 Reorder translation keys 2018-09-26 15:15:48 +02:00
Alberto Maturano
154fc28a57 Normalize to standar file permissions
As a result of taking a look on PR #1967 I realized there is 819
executable files in this repository. It is obvious this is an error.
2018-09-24 12:33:09 -05:00
uyouthe
2f2ad51804 Font-family declarations fixed 2018-09-10 20:59:33 +03:00
Jim LAURIE
cee9fe2811
Merge branch 'master' into email-validation 2018-08-23 18:46:48 +02:00
soupette
8003982b08 Fix conflicts 2018-08-22 14:17:09 +02:00
Jim LAURIE
f27b2ae2f6
Merge branch 'master' into email-validation 2018-08-21 11:54:22 +02:00
Jim LAURIE
ed3f7d9018
Merge branch 'master' into fix-it-users-permissions 2018-08-21 11:40:31 +02:00
Jim LAURIE
ef97f72ff7
Merge branch 'master' into improvement/remember-me 2018-08-21 09:00:41 +02:00
soupette
f120413d26 Fixes 1741 2018-08-20 17:54:00 +02:00
Jim LAURIE
df49f3b8e8
Merge branch 'master' into fix/rgpd 2018-08-20 17:42:27 +02:00
Jim LAURIE
fbc98ed4bb
Merge branch 'master' into master 2018-08-20 15:30:41 +02:00
Jan Brachhold
cef161bc28 Update DE translations - strapi-plugin-users-permissions 2018-08-16 14:34:27 +02:00
soupette
688defca70 Fix conflict 2018-08-10 12:52:11 +02:00
Jim LAURIE
9c17701163
Merge branch 'master' into block-user 2018-08-10 10:02:52 +02:00
Jim LAURIE
86828d731a
Merge branch 'master' into auth-microsoft 2018-08-09 16:59:00 +02:00
Jim LAURIE
eec423a2cd Add confirmation email 2018-08-08 17:57:02 +02:00
Aurelsicoko
3532b20ecf Remove pre-checked checkbox 2018-08-08 16:34:17 +02:00
Jim LAURIE
012cb0332b
Merge branch 'master' into rate-limit 2018-08-08 14:36:42 +02:00
Pierre Burgy
1d2de999dd Tick remember me by default #1716 2018-08-08 11:31:12 +02:00
Jim LAURIE
3f2576cb68 Can block a user 2018-08-06 17:46:58 +02:00
Jim LAURIE
90041a5fba
Merge branch 'master' into master 2018-08-06 09:43:14 +02:00
Jim LAURIE
1dbbea458d
Merge branch 'master' into translation/fr 2018-08-06 09:27:28 +02:00
David Thomas
27c88e3a1a
Merge branch 'master' into auth-microsoft 2018-08-05 12:20:05 -04:00
soupette
ccb4fe0270 Pull enhancement/sortable-input because master is too buggy with my modifications 2018-08-02 15:51:10 +02:00
Jim LAURIE
738cbf656a Add rate limit on auth routes 2018-08-01 14:56:31 +02:00
Jim LAURIE
7f0159f547
Merge branch 'master' into fix-users-advanced-settings 2018-08-01 14:35:15 +02:00
soupette
97e8bd46e2 Fix bug data sent 2018-08-01 13:42:31 +02:00
Chris
78e8cb96ea Added the Dutch (NL) language 2018-08-01 09:17:53 +02:00
Basile Bong
260a9bf69b Add > FR translation keys 2018-07-31 19:26:51 +02:00
Jim LAURIE
f559bcc82c
Merge branch 'master' into discordProvider 2018-07-31 16:18:04 +02:00
Jim LAURIE
6ec8c627c0
Merge branch 'master' into patch-3 2018-07-31 13:53:29 +02:00
DMehaffy
fb0e848ee0
Merge branch 'master' into discordProvider 2018-07-31 04:52:54 -07:00
Jim LAURIE
a66c3d8eb0
Merge branch 'master' into translation/de 2018-07-31 13:42:51 +02:00
soupette
ac382484b3 Fix path for advanced settings 2018-07-31 13:33:45 +02:00
DMehaffy
b8adba1e23 Finish adding Discord to Providers.js
Thanks to synth3tk for your help!

Note that with Discord the username is not unique so I combined the username and discriminator in order to store a unique "username"
2018-07-29 17:43:45 -07:00