yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-15 04:08:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,264 Commits 116 Branches 489 Tags
Commit Graph

1421 Commits

Author SHA1 Message Date
Hicham EL ABBASSI
81c5537d7f Merge branch 'develop' into features/single-types 2020-01-29 10:09:46 +01:00
Alexandre Bodin
4f5a0e7679 Cleanup eslint configs 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-27 10:49:57 +01:00
soupette
96e092b300 Change the way we load plugins 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-23 16:46:50 +01:00
Alexandre Bodin
1106c07795 v3.0.0-beta.18.6 2020-01-23 08:13:13 +01:00
Mariusz Wachowski
4e5326490e feat: updated pl translations 
Signed-off-by: Mariusz Wachowski <wachowski.mariusz@gmail.com>
 2020-01-22 21:54:08 +01:00
Alexandre Bodin
7a9c481d59 Merge branch 'develop' into features/single-types 2020-01-22 12:05:46 +01:00
Alexandre Bodin
9c96b180fe Merge branch 'develop' into features/single-types 2020-01-22 10:39:42 +01:00
soupette
be64adaa1c Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-22 10:29:36 +01:00
soupette
b3ba8c27ef Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 16:12:46 +01:00
Alexandre Bodin
2ee13c0a12 v3.0.0-beta.18.5 2020-01-21 15:44:44 +01:00
Alexandre BODIN
bab82c864c
Merge branch 'master' into strapi-thomb-upgrade-purest 2020-01-21 14:26:51 +01:00
Alexandre Bodin
dce6bd432c Merge branch 'develop' into features/single-types 2020-01-21 11:46:26 +01:00
soupette
6c27d224f2 Add eslint config 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 11:33:43 +01:00
Alexandre BODIN
4bebeb7d6d
Merge branch 'master' into master 2020-01-21 10:39:37 +01:00
Jim LAURIE
8027b135e1 fix: fix get role via graphql 
Find one role issue due to params sharing in the GraphQL schema.
fix #5013
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-01-20 17:00:20 +01:00
nurikabe
4ab268b134 RFC-822 doesn't require double quotes around the descriptive name in an email address 2020-01-18 16:39:27 -05:00
Alexandre Bodin
d1600dec21 Fix user-permissions bootstrap issue 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-16 16:56:14 +01:00
Fredrik Söderquist
21bbbbcfe8
Merge branch 'master' into fix/readCallbackProvider 2020-01-15 11:25:12 +01:00
Fredrik Söderquist
47a3a20654 remove querystring from ctx.path when reading provider 2020-01-15 11:18:12 +01:00
Alexandre BODIN
d04e5558e2
Merge branch 'master' into strapi-thomb-upgrade-purest 2020-01-14 11:53:52 +01:00
Alexandre BODIN
d11b1ba4a5
Merge branch 'master' into patch-1 2020-01-13 11:29:47 +01:00
nurikabe
3c38fc33bf Remove soft hyphen (U+00AD) from reset password email subject line 2020-01-11 11:29:24 -05:00
virginieky
50643f94b3
Merge branch 'master' into chore/eslint-config 2020-01-10 17:44:43 +01:00
slackr
89675409ba
fix error reply text 2020-01-10 07:40:17 -05:00
Thomas Baxter
37dbd955e2 feat(purest): upgrading purest to 3.x 2020-01-08 12:55:16 -05:00
Jim LAURIE
df1fed99ec docs: update copyright date to 2020 2020-01-08 15:41:08 +01:00
soupette
c62dad2140 Improve eslint config fron front-end files 2020-01-08 12:21:47 +01:00
Thomas Baxter
65482537dd chore(deps): initial commit of upgrade to purest 2020-01-07 14:24:39 -05:00
Jaroslav Vrána
0215f64648
Merge branch 'master' into feature/adminTranslationCs 2020-01-07 19:32:32 +01:00
Alexandre Bodin
f0028241c8 v3.0.0-beta.18.4 2020-01-07 17:00:28 +01:00
Jozef Cipa
61972f6292
Merge branch 'master' into feature/slovak-translations 2020-01-06 18:22:48 +01:00
Alexandre BODIN
089c2cd189
Merge branch 'master' into fix-2963 2020-01-06 15:50:17 +01:00
profispojka
2c9b8283b3
Update cs.json 2020-01-05 16:04:00 +01:00
profispojka
379033a91c
Merge branch 'feature/adminTranslationCs' into feature/adminTranslationCsWithPlugins 2020-01-05 15:59:47 +01:00
unknown
6e4fe7141a fix typos, merge 2020-01-05 15:48:51 +01:00
unknown
72e76c97f2 update translations to latest master 2020-01-05 15:40:09 +01:00
unknown
8281ed7a8f merge master changes 2020-01-05 14:36:47 +01:00
jozefcipa
ea23166e3e Fix typos 2020-01-05 14:11:00 +01:00
unknown
d53d7ac5e2 cs translation fixes 2020-01-05 13:05:57 +01:00
Jaroslav Vrána
d65db853ea
Merge branch 'master' into feature/adminTranslationCs 2020-01-02 21:29:51 +01:00
Jaroslav Vrána
3d590e5762 fix: typo 2020-01-02 21:24:51 +01:00
jozefcipa
760a3d5dd8 Add slovak translations 2019-12-30 16:22:25 +01:00
Jim LAURIE
d4432d1627 fix: update user loggedin via provider 
Apply the password not null validation only if the provider is local.
With that provider users not require a password on profile update.

fix #2963
 2019-12-28 16:42:53 +01:00
Jim LAURIE
e5456da8eb
Merge branch 'master' into master 2019-12-23 11:04:29 +01:00
Alexandre Bodin
c2650b085c v3.0.0-beta.18.3 2019-12-23 10:17:40 +01:00
Alexandre BODIN
2d6070a42c
Merge branch 'master' into patch-1 2019-12-23 10:04:37 +01:00
Alexandre Bodin
632bf537ec Login and register return simpler informations 2019-12-20 13:38:52 +01:00
Abdón Rodríguez Davila
4620546d4c
Add populate option to the fetch user service 2019-12-19 18:58:46 +01:00
Alexandre Bodin
8586b3dd39 v3.0.0-beta.18.2 2019-12-19 11:17:14 +01:00
Alexandre Bodin
8e2fb1ff1a v3.0.0-beta.18.1 2019-12-18 09:05:32 +01:00