yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 02:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,922 Commits 121 Branches 507 Tags
Commit Graph

1420 Commits

Author SHA1 Message Date
Virginie Ky
a5718f9eb7 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 2020-03-27 09:44:49 +01:00
Alexandre BODIN
9fdb650c6c
Fix rerouting of destroy route in user-perm (#5581) 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-26 13:55:52 +01:00
Roel Beerens
2570e27238 feat: Added missing forgotPassword, changePassword and emailConfirmation mutations/resolvers. Made a slight adjustment to the emailConfirmation controller function in Auth.js to return a UsersPermissionsLoginPayload when using GraphQL 
Signed-off-by: Roel Beerens <roel@gravity.nl>
 2020-03-23 18:02:26 +01:00
Derrick Mehaffy
8f7af83049
Remove extra console.log in users-permissions 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-23 03:50:35 -07:00
Kim, Harim
40ea493b26
Fix context issue in custom GraphQL query and mutation (#5532) 
* fix context issue in custom query and mutation

Signed-off-by: harimkims <harimkims@gmail.com>

* merge only state-related context

Signed-off-by: harimkims <harimkims@gmail.com>

* roll back the code, fix the test instead

Signed-off-by: harimkims <harimkims@gmail.com>
 2020-03-20 14:24:14 +01:00
Virginie Ky
fe20425215 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 2020-03-16 14:52:58 +01:00
Alexandre BODIN
9ab43d2c42
Merge branch 'master' into fix/#4901/findOneCantHaveMultipleParametersWhenThereIsAPK 2020-03-12 16:10:56 +01:00
virginieky
1698dfe98c Merge branch 'develop' into front/ui-improvements 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-09 10:57:49 +01:00
Pierre Noël
b5ec9cb1c8 handle unexpected params from koa-router 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-06 19:16:51 +01:00
soupette
8a8929e97c v3.0.0-beta.19.3 2020-03-06 10:02:36 +01:00
Virginie Ky
b69d3f807d Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-05 19:18:35 +01:00
Alexandre Bodin
b3e18e1de6 v3.0.0-beta.19.2 2020-03-05 14:32:42 +01:00
Alexandre Bodin
8e91e5abaf v3.0.0-beta.19.1 2020-03-04 18:42:31 +01:00
Alexandre Bodin
e222792181 v3.0.0-beta.19 2020-03-04 14:24:23 +01:00
soupette
7c12398df6 Fixes #5404 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 12:16:26 +01:00
HichamELBSI
b5947621fc Merge branch 'master' into develop 2020-03-04 09:32:13 +01:00
soupette
3a695aeaac Merge branch 'develop' of github.com:strapi/strapi into chore/remove-saga-admin 2020-03-02 11:34:01 +01:00
Alexandre Bodin
bff34ad023 Fix missing lib in users-permissions 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 09:59:33 +01:00
soupette
ccc92b90a5 Add required info into the plugin object and update plugin generator 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 11:40:55 +01:00
Alexandre Bodin
3bcbde8f0b v3.0.0-beta.18.8 2020-02-26 12:01:37 +01:00
virginieky
8d36b69507
Merge branch 'front/ui-improvements' into front/font-weight 2020-02-13 13:46:49 +01:00
cyril lopez
021f88c88f
Merge pull request #5241 from strapi/front/trash-icon 
Generalize all trash icon
 2020-02-13 13:31:07 +01:00
Virginie Ky
fb55ce3426 clean 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-13 11:36:19 +01:00
Alexandre Bodin
8a6c48eb14 Merge branch 'develop' into features/single-types 2020-02-13 11:36:07 +01:00
Virginie Ky
138bbae981 generalize all trash icons 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-13 11:29:01 +01:00
Virginie Ky
6e4dbf6394 Merge branch 'develop' of github.com:strapi/strapi into front/font-weight 2020-02-12 13:51:27 +01:00
soupette
86dcf65c20 Use logo from the plugin object instead of the one from github in the user-permissions plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-11 17:29:14 +01:00
soupette
f924a53a8a Add pluginLogo to the plugin object in order to prevent fetching the logo from github 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-11 17:15:53 +01:00
Virginie Ky
45ecaec15c font-weight and alignment 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-11 17:12:40 +01:00
Alexandre Bodin
49b6a44078 Fix lint 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:40:13 +01:00
Alexandre Bodin
3ce852af61 User :: in policies prefix and update documentation accordingly 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:39 +01:00
Alexandre Bodin
0c6d39297f Add graphql tests for single-types 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:37 +01:00
Alexandre Bodin
de9521ce6b Merge branch 'develop' into features/single-types 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:09:50 +01:00
Alexandre Bodin
8a970562c9 Merge branch 'master' into develop 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 19:15:20 +01:00
Jim LAURIE
015b4a5e23
Merge branch 'master' into fix/findUserByProvider 2020-02-07 10:10:30 +01:00
Jim LAURIE
638ddd201e
Merge branch 'master' into update-zh-hans-translations 2020-02-07 09:56:09 +01:00
Fredrik Söderquist
52e6d33f0e Match provider when logging in, to make sure the right user is found 
Signed-off-by: Fredrik Söderquist <fregu808@gmail.com>
 2020-02-06 21:14:36 +01:00
cyril lopez
8745d2373a
Merge branch 'master' into feat/update-pl-translations 2020-02-06 14:39:05 +01:00
HichamELBSI
6fff7fcf46 Merge branch 'develop' into features/single-types 2020-02-06 14:11:44 +01:00
HichamELBSI
98871fcb46 Merge branch 'develop' into features/single-types 2020-02-05 16:41:30 +01:00
ruibaby
ff489ce051 feat: updated zh-Hans translations. 
Signed-off-by: ruibaby <i@ryanc.cc>
 2020-02-04 15:55:02 +08:00
soupette
3473143813 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-31 17:14:24 +01:00
Virginie Ky
bb9ff9e47a Merge branch 'master' into develop 2020-01-31 15:10:07 +01:00
Alexandre Bodin
761ad68392 v3.0.0-beta.18.7 2020-01-30 16:15:25 +01:00
soupette
a49d696c51 Fix routing and menu highlight 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-30 12:32:29 +01:00
soupette
144d07cdbe Improve plugin left menu for trads and enable settings api 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-30 11:50:34 +01:00
Alexandre Bodin
576279626b Merge branch 'develop' into features/single-types 2020-01-29 11:59:53 +01:00
Alexandre Bodin
b999bea3a9 Merge branch 'master' into develop 2020-01-29 11:59:41 +01:00
Virginie Ky
4ff189ac00 Merge branch 'master' into develop 2020-01-29 11:35:55 +01:00
Hicham EL ABBASSI
81c5537d7f Merge branch 'develop' into features/single-types 2020-01-29 10:09:46 +01:00