yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-08 00:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,371 Commits 113 Branches 488 Tags
Commit Graph

15371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Pierre Noël
05cc400905 update grant + doc twitter 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:28 +02:00
Pierre Noël
75cb374f89 Update the provider loggin doc + display absolute redirect uri in front 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-04 09:49:28 +02:00
Alexandre BODIN
a8bb45da52
Merge pull request #7299 from strapi/rbac/user-creation-event 
Add events for user creation
 2020-08-03 18:41:53 +02:00
Alexandre BODIN
e9757182cc
Merge pull request #7144 from strapi/chore/rbac-tracking 
Add events for the rbac feature.
 2020-08-03 18:40:26 +02:00
Alexandre BODIN
3fbd684981
Merge pull request #7303 from strapi/minor/addKoaProxyConf 
Add conf proxy koa variable
 2020-08-03 18:12:46 +02:00
Alexandre BODIN
ce3a00f2ed
Merge branch 'master' into chore/rbac-tracking 2020-08-03 17:40:16 +02:00
Pierre Noël
112716fc9b add conf proxy koa variable 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-03 17:34:05 +02:00
HichamELBSI
43ee492fcb Init Users & Permissions settings section 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-08-03 17:11:58 +02:00
Alexandre BODIN
81a4509750
Merge pull request #7263 from votemike/gender-equality 
Gender equality wordings
 2020-08-03 17:06:23 +02:00
Derrick Mehaffy
34c90c9658
Remove session options from docs that no longer work 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
https://github.com/strapi/strapi/issues/6421
 2020-08-03 06:44:53 -07:00
Pierre Noël
9c957759b7 enrich test 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-03 14:08:19 +02:00
Pierre Noël
c9545f2b7d refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-03 14:08:18 +02:00
Convly
ba8954794b Add telemetry events for user creation 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-08-03 14:08:18 +02:00
Alexandre BODIN
7b19532728
Merge pull request #7280 from strapi/fix/uploadPathAbsolute 
Upload path can be absolute
 2020-08-03 14:01:59 +02:00
Pierre Noël
bc96123485 use resolve 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-03 11:05:43 +02:00
Pierre Noël
c8207b7809 upload path can be absolute 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-31 17:39:29 +02:00
Alexandre Bodin
97922f99ae v3.1.3 v3.1.3 2020-07-31 09:59:56 +02:00
Alexandre BODIN
95bb4c74ff
Merge pull request #7275 from aksdevac/master 
Fix #7252: fix relation name
 2020-07-31 09:45:20 +02:00
Akash P
27ee50d1e5
Fix #7252: fix relation name 
fix regression issue due to pull #7204

Signed-off-by: Akash P <aksdevac@gmail.com>
 2020-07-31 12:59:46 +05:30
Marius Wallin
d8a39da12b
Update digitalocean-one-click.md (#7255) 
Based on what is created in version 3.1 from the Droplet the default folder is strapi-development and the .env is in the root of this folder
 2020-07-30 06:00:49 -07:00
Michael Gwynne
e6d3cc730c Gender Equality 
Signed-off-by: Michael Gwynne <michael.gwynne@checkatrade.com>
 2020-07-30 12:06:32 +01:00