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
13,206 Commits 113 Branches 488 Tags
Commit Graph

13206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cyril lopez
dbaef20ae9
Merge pull request #6353 from strapi/fix/header-logo 
Move header logo to the left
 2020-05-26 11:51:07 +02:00
cyril lopez
e87610e4ff
Merge branch 'master' into fix/header-logo 2020-05-26 11:50:46 +02:00
cyril lopez
4bf3501b69
Merge pull request #6354 from strapi/chore/fix-front-issues 
Chore/fix front issues
 2020-05-26 11:50:31 +02:00
cyril lopez
b1b055fb0b
Merge branch 'master' into chore/fix-front-issues 2020-05-26 10:47:17 +02:00
HichamELBSI
5e5a27bac9 Move header logo to the left 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-05-26 10:34:25 +02:00
soupette
b1b7941434 Fixes #5982 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-05-26 10:03:46 +02:00
Thiago Augusto
5003e47717
Adding private field support to UID (#6331) 
Signed-off-by: Thiago Augusto <thiago.android88@gmail.com>
 2020-05-26 09:46:48 +02:00
soupette
bc7d42d928 Fixes #6153 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-05-26 09:35:44 +02:00
soupette
c921bcc063 Fixes #6160 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-05-26 09:29:00 +02:00
cyril lopez
fd6938a49a
Remove help link (#6345) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-05-25 18:35:41 +02:00
Tudor Ilisoi
86d5caf77b
fixes #5984 (#6055) 
* fixes #5984

Signed-off-by: Tudor Ilisoi <tudorilisoi@yahoo.com>

* fixes #5984 again

Signed-off-by: Tudor Ilisoi <tudorilisoi@yahoo.com>

* fixed tests

Signed-off-by: Tudor Ilisoi <tudorilisoi@yahoo.com>

* removed search params encoding in the upload plugin

Signed-off-by: Tudor Ilisoi <tudorilisoi@yahoo.com>
 2020-05-25 18:24:39 +02:00
trick0
9e8a084805
Add Users count endpoint (#5859) 
* added user count

Signed-off-by: Walter Cossu <walter.cossu@realt.it>

* added countSearch method to user service

* added countSearch method to user service

Signed-off-by: Walter Cossu <walter.cossu@realt.it>

* added user count

Signed-off-by: Walter Cossu <walter.cossu@realt.it>

Co-authored-by: Walter Cossu <walter.cossu@realt.it>
 2020-05-25 18:19:04 +02:00
Alexandre BODIN
61c0c9d9b4
Add v3.x and remove alpha docs (#6344) 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-25 18:11:45 +02:00
Drew Town
549803adfc
Sanitize user object in user plugin update method return value (#6003) 
* Sanitize user object in update method return value

Signed-off-by: Drew Town <drew.town+github@gmail.com>

* Sanitize returned user data on create and destroy
 2020-05-25 17:39:33 +02:00
Jørgensen
65cc815a18
Upload proxy - Using Header objects build-in entries function (#6340) 
* Using Header objects build-in entries function

* Using const in iteration
 2020-05-25 16:05:12 +02:00
Alexandre Bodin
bdf47753b2 Add one change in migration guide 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-25 15:47:28 +02:00
Alexandre BODIN
f32bc7b30b
Merge pull request #5655 from ScottAgirs/patch---adjust-naming-to-password-mutations 
Fix #5653: improve UserPermissions - password mutations
 2020-05-25 15:44:48 +02:00
Alexandre BODIN
41ca5eaabb
Merge pull request #6343 from strapi/chore/migration-stable 
Migration guide for stable
 2020-05-25 15:35:55 +02:00
Alexandre Bodin
7df82f5e62 Add cleanup instruction 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-25 15:27:33 +02:00
Alexandre Bodin
9078081eba Add strucutre example 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-25 15:25:43 +02:00
Alexandre Bodin
02fcbf8f45 Update more configs 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-25 15:25:43 +02:00
Alexandre Bodin
fc6245b2d5 Migration guide for stable 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-25 15:25:43 +02:00
Alexandre Bodin
004c881c61 Merge branch 'develop' 2020-05-25 15:21:37 +02:00
Alexandre BODIN
d91c5f19c5
Merge pull request #6053 from strapi/fix/ctb-default-date-input 
Fix/ctb default date input
 2020-05-25 15:21:18 +02:00
Alexandre Bodin
b512a19fc0 Merge branch 'master' of github.com:strapi/strapi 2020-05-25 15:18:55 +02:00
Alexandre Bodin
4a3ae0348b check timestamps option exists on model 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-25 15:18:46 +02:00
Alexandre BODIN
b4f168963d
Merge pull request #6226 from caiojhonny/patch-1 
documentaiton typo
 2020-05-25 14:57:36 +02:00
Alexandre BODIN
efe40dc3ac
Merge pull request #6313 from epegzz/patch-2 
Fix typo
 2020-05-25 14:56:45 +02:00
Alexandre BODIN
1980dafa06
Merge pull request #6315 from strapi/jwtconfig 
Add JWT configurations
 2020-05-25 14:55:42 +02:00
Alexandre BODIN
1caf7e0ff2
Merge pull request #6338 from Froelund/patch-9 
Clarified upload proxy error messages
 2020-05-25 14:53:31 +02:00
Caio Jhonny
71fb8156a7
Merge branch 'master' into patch-1 2020-05-25 12:04:39 +02:00
Jørgensen
b23286a90f
Clarified upload proxy error messages 2020-05-25 10:09:19 +02:00
Alexandre BODIN
2b22675edc
Merge pull request #6321 from strapi/ui/logo 
Change the logo
 2020-05-22 15:54:21 +02:00
HichamELBSI
1f0f96e46b Change the logo 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-05-22 15:35:08 +02:00
Caio Jhonny
a3ee191d5a
Merge branch 'master' into patch-1 2020-05-22 12:49:20 +02:00
Jim LAURIE
fc4cef9926 fix: fix pr feedback 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-05-22 10:34:38 +02:00
Jim LAURIE
16c304d710 Merge branch 'master' of github.com:strapi/strapi into jwtconfig 2020-05-22 10:22:14 +02:00
Daniel Schäfer
3f0a67234d
Fix typo 2020-05-21 19:56:22 +02:00
Alexandre BODIN
a358d87a68
Merge pull request #6293 from strapi/fix/policy-find-case-insensitive 
Fix global policies case sensitive
 2020-05-20 14:16:40 +02:00
Alexandre BODIN
688311173a
Merge pull request #6291 from strapi/fix/ctb 
Fix ctb react-select ui
 2020-05-20 14:08:47 +02:00
Alexandre Bodin
82c6240111 Fix global policies case sensitive 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-20 14:07:57 +02:00
soupette
633744a29c Fix ctb react-select ui 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-05-20 12:09:55 +02:00
Caio Jhonny
6467384d0d Add missing comma 
Signed-off-by: Caio Jhonny <caiojhonnyp@gmail.com>
 2020-05-20 10:18:10 +02:00
yvesdo
d754c2b102
Update README.md 2020-05-19 19:43:24 +02:00
ScottAgirs
ef861f19ff [bugfix] register() input, payload 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-05-19 12:03:31 -04:00
ScottAgirs
ebed726d7b [bugfix] register(input: UsersPermissionsRegisterInput) 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-05-19 11:58:36 -04:00
Alexandre BODIN
f1116160ad
Merge pull request #6012 from mkqavi/fix/local-upload-url-encoding 
Fix url encoding for local upload provider
 2020-05-19 13:40:18 +02:00
Alexandre BODIN
9f5844949d
Merge pull request #6124 from frosato-dev/master 
Prevent user registration with confirmed status
 2020-05-19 13:21:58 +02:00
François Rosato
37e97d6219 Prevent user registration with confirmed status 
Pull request https://github.com/strapi/strapi/pull/6072 aimed to add security by preventing creation of user with email confirmation enabled. By limiting user params to 'username', 'email', 'password', the current code do not allow adding custom field to user entity during registration which may breaks existing applications that have added required custom fields into user model .

Signed-off-by: François Rosato <francois.rosato@ekino.com>
 2020-05-19 11:52:45 +02:00
cyril lopez
586f3ba29d
Merge branch 'develop' into fix/ctb-default-date-input 2020-05-19 05:42:30 +02:00