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

14792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daan van Ham
0f34541231
Merge branch 'master' into master 2020-08-07 16:16:09 +02:00
Jim LAURIE
9f4839028c
Merge pull request #7344 from joshjung/master 
Change CORS documentation on origin
 2020-08-07 16:07:31 +02:00
Jim LAURIE
16f1554e15
Merge branch 'master' into master 2020-08-07 16:07:23 +02:00
Rémi de Juvigny
5fcbcaa2f5
Merge branch 'master' into local-upload-readme 2020-08-07 16:03:38 +02:00
DMehaffy
f179a1cae9
Fix docs for loading ORM plugins (#7356) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-08-07 15:56:52 +02:00
Rémi de Juvigny
dbaf04286a Fix local upload provider docs 2020-08-07 15:56:29 +02:00
Adam
c8dc074d3b
fix(graphql): filter out orphaned relationships (#7363) 
Signed-off-by: Adam Lee <admosity@users.noreply.github.com>
 2020-08-07 15:55:53 +02:00
Daan van Ham
e933c28012 fixed strapi/strapi#7334 add the data-loader for admin users to the graphql-plugin 
Signed-off-by: Daan van Ham <daan.van.ham@frontmen.nl>
 2020-08-07 15:50:16 +02:00
Jim LAURIE
4db3d1a9c0
Merge pull request #7342 from strapi/docs/admin/7322 
Fix custom admin guide typo
 2020-08-07 15:18:33 +02:00
Jim LAURIE
ad68fbb7b5
Merge pull request #7341 from AntoninBeaufort/master 
Email plugin docs fix typo
 2020-08-07 15:17:08 +02:00
Jim LAURIE
ccb781f158
Merge branch 'master' into master 2020-08-07 15:16:52 +02:00
soupette
c318157633 Fix import name 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-07 12:55:24 +02:00
Darshan Gada
862f2c386b FIX: Broken links to email configurations & middlewares 
Signed-off-by: Darshan Gada <gadadarshan@gmail.com>
 2020-08-07 15:53:46 +05:30
Alexandre BODIN
de10a34592
Merge pull request #7327 from strapi/dependabot/npm_and_yarn/whatwg-fetch-3.3.1 
Bump whatwg-fetch from 2.0.4 to 3.3.1
 2020-08-07 10:29:13 +02:00
soupette
001cc0f865 Fix trads 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-07 10:00:31 +02:00
soupette
faf5ddfebc Fix subscriptions 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-07 09:56:06 +02:00
Alexandre BODIN
08bef6d957
Merge pull request #7350 from strapi/fix/7335 
Fix sanitizeEntity's includeFields usage
 2020-08-07 09:49:50 +02:00
soupette
1e9f816b0b Add events 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-07 09:48:28 +02:00
soupette
e688910128 Refacto code 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-07 09:28:29 +02:00
soupette
d1c7f8873c PUT providers 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-07 08:32:40 +02:00
soupette
fb77ac3702 Init provider form 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-06 18:40:22 +02:00
soupette
17f8ab3296 Edit template 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-06 16:41:10 +02:00
Convly
10cc543cc7 Fix sanitizeEntity's includeFields usage for dynamic zones 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-08-06 15:13:45 +02:00
soupette
f781790d67 Fix lint and Add modal edit templates 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-06 13:29:00 +02:00
Joshua Jung
6483d6186c Change CORS documentation on origin 
CORS documentation on the origin property is now more explicit for multiple domains.

Signed-off-by: Joshua Jung <josh@jungdigital.com>
 2020-08-05 22:48:39 +02:00
antoninbeaufort
92d470ed89
Merge branch 'master' of https://github.com/AntoninBeaufort/strapi 2020-08-05 20:21:16 +02:00
Antonin Beaufort
f48892a0d7
[Docs] Email plugin : fix typo 
Signed-off-by: antoninbeaufort <33757018+AntoninBeaufort@users.noreply.github.com>
 2020-08-05 20:19:34 +02:00
Antonin Beaufort
d536560960
[Docs] Email plugin : fix typo 
Signed-off-by: antoninbeaufort <antonin.beaufort@gmail.com>
 2020-08-05 20:12:27 +02:00
Derrick Mehaffy
39e76716d2
fix typo 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-08-05 11:02:40 -07:00
soupette
2deea0748c Send advanced settings data 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-05 15:21:25 +02:00
soupette
d41f02bb54 Merge branch 'features/users-permissions' of github.com:strapi/strapi into front/list-views 2020-08-05 14:49:19 +02:00
cyril lopez
f4a59efc62
Merge pull request #7316 from strapi/users-permissions/roles-list 
Add Roles list
 2020-08-05 09:22:58 +02:00
dependabot[bot]
be55fdb69d
Bump whatwg-fetch from 2.0.4 to 3.3.1 
Bumps [whatwg-fetch](https://github.com/github/fetch) from 2.0.4 to 3.3.1.
- [Release notes](https://github.com/github/fetch/releases)
- [Commits](https://github.com/github/fetch/compare/v2.0.4...v3.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-04 22:21:05 +00:00
Alexandre BODIN
7113f7f11f
Merge pull request #7132 from strapi/fix/loginProviders 
Fix/login providers
 2020-08-05 00:02:17 +02:00
Jim LAURIE
b047dbfb79
Merge pull request #7300 from strapi/docs/sessionClean 
Remove session options from docs that no longer work
 2020-08-04 20:17:25 +02:00
soupette
99728005d1 Clean unneeded files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-04 18:13:22 +02:00
soupette
25cfefc894 Add form logic 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-04 18:10:35 +02:00
soupette
23e2c3d171 Fix loading states 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-04 17:48:23 +02:00
soupette
63f4859e31 Init advanced settings page 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-04 17:45:45 +02:00
HichamELBSI
c21ca119e4 Add Roles list 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-08-04 17:05:58 +02:00
soupette
5f834d2288 Created Email templates list 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-04 16:38:04 +02:00
soupette
1602886deb Add tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-04 16:27:07 +02:00
soupette
a1592c9626 Created providers list view 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-04 15:59:19 +02:00
soupette
8575995080 Add page title to settings 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-04 14:33:43 +02:00
cyril lopez
f4aad12f5a
Merge pull request #7302 from strapi/settings/users-permissions 
[WIP] Init Users & Permissions settings section
 2020-08-04 13:58:21 +02:00
HichamELBSI
cb0f33c756 Update permissions 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-08-04 13:19:48 +02:00
Pierre Noël
77293268c6 Specify that only grant providers are supported 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:30 +02:00
Pierre Noël
b4afb8afcc move a tip 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:30 +02:00
Pierre Noël
6f369201a4 replace .fr by .com 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:29 +02:00
Pierre Noël
b5959705b2 refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:29 +02:00