yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-18 13:02:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,540 Commits 123 Branches 495 Tags
Commit Graph

1428 Commits

Author SHA1 Message Date
Alexandre Bodin
cc9d23c3ac Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-07 20:24:39 +02:00
Jean-Sébastien Herbaux
a583d1b859
Fix/#3184/fix server crashs on database change (#5703) 
* Don't set connection field on create/edit operation on content-types & components

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Make sure that every component has a valid connection attribute

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove connection check on components load

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove default connections from core & webhook stores but make sure it's defined in the application lifecycle

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix component's associations that can be undefined instead of empty in populateBareAssociations

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove "default" connection from plugins' models

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove connection attribute from generated models (cli)

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Mutate each component instead of reassign

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Build core_store and webhook model based on the current config

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Add connection to templates conditionally (based on args)

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Set default value for description to undefined instead of empty string

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove unnecessary complexity

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Update getStarted models

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix attributes parsing for generate:model

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Removed tpl option from generate:model/api

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove tpl option from cli

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-04-07 16:31:44 +02:00
Alexandre Bodin
8d56e0c12f v3.0.0-beta.19.5 2020-04-01 11:27:56 +02:00
Alexandre Bodin
50df7365d6 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 12:04:04 +02:00
Alexandre Bodin
24bd311678 v3.0.0-beta.19.4 2020-03-30 09:57:05 +02:00
Convly
f171029243 Change checkBadRequest's exception shape 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-03-27 14:33:55 +01:00
Convly
2d8e55838e Update path to contextBody attributes in schema.graphql.js@checkBadRequest() 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-03-27 12:19:44 +01:00
soupette
2e525a7f65 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-27 07:47:17 +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
soupette
38b7823b34 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-26 08:01:22 +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
Alexandre Bodin
72440af84b Merge branch 'develop' into features/media-lib 2020-03-23 17:28:21 +01:00
soupette
818927f7b5 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-23 14:33:17 +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
soupette
f99f83af02 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-13 11:04:45 +01:00
Alexandre BODIN
9ab43d2c42
Merge branch 'master' into fix/#4901/findOneCantHaveMultipleParametersWhenThereIsAPK 2020-03-12 16:10:56 +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
f3bcddcf89 Identify front-end core files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-06 13:33:32 +01:00
soupette
bdc2758613 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-06 11:44:20 +01:00
soupette
8a8929e97c v3.0.0-beta.19.3 2020-03-06 10:02:36 +01:00
Alexandre Bodin
e1a7074a4e Merge branch 'develop' into features/media-lib 2020-03-05 14:39:29 +01:00
Alexandre Bodin
b3e18e1de6 v3.0.0-beta.19.2 2020-03-05 14:32:42 +01:00
soupette
f1de079d77 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 10:22:49 +01:00
Alexandre Bodin
8e91e5abaf v3.0.0-beta.19.1 2020-03-04 18:42:31 +01:00
soupette
d6bc4e1941 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 14:52:29 +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
Alexandre Bodin
7a8c865051 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 15:18:08 +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
Alexandre Bodin
8a6c48eb14 Merge branch 'develop' into features/single-types 2020-02-13 11:36:07 +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
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