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

14807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alexandre BODIN
836b49f218
Merge pull request #7167 from strapi/chore/clean-deps 
Cleanup shelljs
 2020-07-30 12:36:28 +02:00
DMehaffy
28b66d284f
Add more information about the parser middleware configuration (#7253) 
* Add more information about the parser middleware configuration

Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>

* fix integer case

Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-07-30 09:49:28 +02:00
dependabot[bot]
97dfde210a
Bump koa-session from 5.13.1 to 6.0.0 (#7254) 
Bumps [koa-session](https://github.com/koajs/session) from 5.13.1 to 6.0.0.
- [Release notes](https://github.com/koajs/session/releases)
- [Changelog](https://github.com/koajs/session/blob/master/History.md)
- [Commits](https://github.com/koajs/session/compare/5.13.1...6.0.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-30 09:45:53 +02:00
Alexandre BODIN
c3e9b6c8ce
Merge branch 'master' into chore/clean-deps 2020-07-29 17:49:54 +02:00
Alexandre BODIN
cba02febf2
Upgrade api token tuto to not break rbac feature (#7250) 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-29 17:41:02 +02:00
Sebastian Campos
c3f4afca87
Docs/parameters typos (#7238) 
* fix 'complexE' typos

* fix 'complexE' typos

Co-authored-by: scampos <sebastian@synergiar.com>
 2020-07-29 17:39:28 +02:00
Alexandre Bodin
8a702bc6e8 Merge branch 'master' into documentation 2020-07-29 13:36:37 +02:00
Alexandre Bodin
6aaa018ff5 v3.1.2 v3.1.2 2020-07-29 13:34:01 +02:00
Alexandre Bodin
c603514b85 Add dependabot reviewers 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-29 13:28:34 +02:00
Maxime Castres
b4c430792c
Add the CheatSheet link (#7213) 
Signed-off-by: Maxime Castres <mcastres@student.42.fr>
 2020-07-29 13:27:59 +02:00
Alexandre BODIN
7394a35c51
Fix CE tests for travis (#7218) 
* Fix CE tests for travis

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

* Start app in CE too

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

* Cleanup

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-29 13:24:27 +02:00
egg
efdf03cf6d
add Japanese translation of media library (#7226) 
Signed-off-by: eggpogg <eggpogg.t@gmail.com>

Co-authored-by: cyril lopez <cyril.lpz@gmail.com>
 2020-07-29 13:21:50 +02:00
Alexandre BODIN
0ea63e05e4
Merge pull request #7178 from ericliu-el/fix-Input-Number-issue 
Fix Input Number issue
 2020-07-29 13:20:38 +02:00
Alexandre BODIN
8cf4f94db6
Merge pull request #7217 from strapi/fix/pg-core-store 
Fix core_store init first
 2020-07-29 13:16:46 +02:00