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
11,408 Commits 116 Branches 489 Tags
Commit Graph

1388 Commits

Author SHA1 Message Date
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
Sulakin Vadim
406dec145e
Update bootstrap.js 2019-12-18 08:23:54 +03:00
Alexandre Bodin
09629c11e8 v3.0.0-beta.18 2019-12-17 14:55:58 +01:00
Alexandre Bodin
6aab5568f8 Fix ctm hidden fields 2019-12-17 12:33:56 +01:00
soupette
9f28c6b8c2 Fix conflicts 2019-12-17 10:20:03 +01:00
soupette
5c2893a6dd Remove useless test 2019-12-16 17:53:42 +01:00
soupette
326f543f48 Fix baseline and migrate to buffetjs header 2019-12-16 17:33:06 +01:00
soupette
69c637d27b Add plugin header from buffet to users plugin hp 2019-12-16 16:54:45 +01:00
unknown
db412a4d3b translations 2019-12-15 17:57:16 +01:00
soupette
0511a54209 Remove useless assets in plugins 2019-12-13 16:15:25 +01:00
soupette
a8f593aeb9 Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dz-post-data 2019-12-11 13:52:11 +01:00
Alexandre Bodin
0ba3d9d7de Merge branch 'develop' into features/dynamic-zones 2019-12-10 16:50:07 +01:00
Alexandre Bodin
03193acf4f Remove populate role on non existing relation breaking mongoose 2019-12-10 16:45:53 +01:00
soupette
aa6d83669f Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dz-post-data 2019-12-09 14:06:29 +01:00
Alexandre Bodin
2fa574b061 Fix isComponent on null attributes 2019-12-09 14:01:11 +01:00
Alexandre Bodin
c5d57b32fe Merge branch 'develop' into features/dynamic-zones 2019-12-09 11:48:46 +01:00
Alexandre BODIN
3acd646701
Merge branch 'master' into improve-authorization-performance 2019-12-09 09:57:58 +01:00
soupette
305ed06634 Change trash icon 2019-12-06 17:11:17 +01:00
soupette
30c70deb3b Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dz-post-data 2019-12-06 14:38:32 +01:00
Alexandre Bodin
29c06e10a3 Merge branch 'develop' into features/dynamic-zones 2019-12-06 12:35:35 +01:00
soupette
c001fe1f3d Remove i tags 2019-12-06 11:09:48 +01:00
Sulakin Vadim
a858c66158
Merge pull request #4 from sulakin/Adding-a-VK-Provider 
add vk
 2019-12-06 01:45:26 +03:00
Sulakin Vadim
fc6ac8e231 add vk 2019-12-06 01:38:06 +03:00
Jim LAURIE
7eaeda7974
Merge branch 'master' into master 2019-12-05 17:29:50 +01:00
harimkims
5f62dbc9a5 Update KO translation 2019-12-04 17:08:08 +09:00
Cowboy
b6ee350ac0 Fix no response when get user permission role with internal network 2019-12-02 14:58:57 +08:00
Alexandre Bodin
cf6ecbff4f v3.0.0-beta.17.8 2019-12-01 23:20:50 +01:00
Jim LAURIE
8199f2d59c v3.0.0-beta.17.7 2019-11-29 17:36:51 +01:00
Virginie Ky
c47985cf9b Merge branch 'features/dynamic-zones' into front/dynamic-zones-ctm-ui 2019-11-28 15:57:06 +01:00
Virginie Ky
587e4450b7 PR review apply 2019-11-26 16:24:53 +01:00
Jim LAURIE
3fe87ffcc7 Fix #4559 lowercase the email in the forgot password function 2019-11-26 16:03:06 +01:00
Alexandre Bodin
9aff9af165 v3.0.0-beta.17.6 2019-11-25 18:54:50 +01:00
Virginie Ky
ef66c9ccb8 Icon from db 2019-11-25 17:08:30 +01:00
Virginie Ky
c640f6872b Icons grid adjustments 2019-11-25 15:56:44 +01:00