yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-03 13:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,807 Commits 118 Branches 492 Tags
Commit Graph

14807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Koen Verheyen
92f3a7ee8b Fixed dutch typos 
Signed-off-by: Koen Verheyen <verheyen.koen@gmail.com>
 2020-05-28 20:47:02 +02:00
Alexandre BODIN
baf3891865
Merge pull request #6419 from strapi/fix/6416 
Fix cron should check for server.cron.enabled option to work
 2020-05-28 20:15:25 +02:00
Alexandre Bodin
c31a03fa4c Fix cron should check for server.cron.enabled option to work 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-28 19:58:26 +02:00
cyril lopez
3e7e364069
Fix lint (#6415) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-05-28 18:58:38 +02:00
Jim LAURIE
276b4a0daf
Merge pull request #6381 from strapi/security/updateDoc 
Update Security doc to reference the stable release
 2020-05-28 14:20:11 +02:00
Jim LAURIE
fad4f707ef
Merge branch 'master' into security/updateDoc 2020-05-28 14:20:03 +02:00
Laurens Kling
47377ec304
Update configurations.md (#6362) 
typos in configurations.md
 2020-05-28 13:57:14 +02:00
Diego M. Rodríguez
970f079d31
Fix documentation at plugins/upload (#6376) 
Fix a couple of typos noticed in `plugins/upload.md` while reading the
documentation.

Signed-off-by: Diego M. Rodriguez <diego.plan9@gmail.com>

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-05-28 13:54:39 +02:00
Akash Patel
a00028636d
Fix #6377 ses email sending, pass required message key (#6378) 
* fix email sending, pass required message key

fix regression pass required message key to node-ses & also pass altText

* fix email sending, pass required message key

fix regression pass required message key to node-ses & also pass altText

Signed-off-by: Akash P <aksdevac@gmail.com>
 2020-05-28 11:56:13 +02:00
Adryan Lucas
d57c794b68
Updates pt-BR locale (#6128) 
* Fix typographical errors in Models concept of documentation (#6094)

Changed from 'liked' to 'linked'

Signed-off-by: Adryan Almeida <adryan1990@gmail.com>

* update portuguese translation

Signed-off-by: Adryan Almeida <adryan1990@gmail.com>

Co-authored-by: Ålevosía <38272871+alevosia@users.noreply.github.com>
 2020-05-28 11:43:16 +02:00
Alexandre Bodin
bb618511aa Merge branch 'documentation' 2020-05-28 11:39:08 +02:00
Pierre Noël
c12c6e95b4
make serverUrl absolute for watch-admin (#6405) 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-28 11:38:50 +02:00
Pierre Noël
4a6ef41201
openbrowser on localhost instead of 0.0.0.0 (#6391) 
Signed-off-by: Pierre Noël <petersg83@gmail.com>

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-05-28 11:17:59 +02:00
ELABBASSI Hicham
344a50944e
Fix snapshots (#6404) 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-05-28 10:46:53 +02:00
Alexandre Bodin
042b6ff4a4 Fix lifecycles doc 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-28 09:40:14 +02:00
Scott Agirs
728e8c63b9
[typo] Persmissions > Permissions (#6390) 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-05-27 17:22:19 +02:00
Alexandre BODIN
eadebf2f96
Fix language middleware (#6387) 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-27 17:12:22 +02:00
Derrick Mehaffy
b9821f6007
Update Security MD to reference the stable release 2020-05-27 05:44:13 -07:00
Abdón Rodríguez Davila
d38b9d35b9
Fix multiple doc links (#6375) 2020-05-27 12:29:53 +02:00
cyril lopez
123ce203e5
Fixes #1766 (#6373) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-05-27 10:46:40 +02:00
Mateusz
4e698340c4 path fix, typos, additional texts 2020-05-27 10:32:35 +02:00
Mateusz
d017c96fa1 guide on unit testing for v3.x 2020-05-26 17:58:53 +02:00
soupette
372643303a Update README 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-05-26 15:40:46 +02:00
soupette
ee43e2009b Created public folder 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-05-26 15:39:28 +02:00
yvesdo
13986f3813
Update Strapi screenshot 2020-05-26 15:26:52 +02:00
Alexandre Bodin
798674dc42 remove old files 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-26 15:22:57 +02:00
Alexandre Bodin
0d5ccbfd2d Merge branch 'master' into documentation 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-26 15:12:18 +02:00
Alexandre Bodin
6bb7a7f198 v3.0.0 v3.0.0 2020-05-26 15:09:32 +02:00
Alexandre Bodin
ac7ff096c9 Merge branch 'master' of github.com:strapi/strapi 2020-05-26 14:48:05 +02:00
Alexandre Bodin
e45a55cc8f Update publish script 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-26 14:48:00 +02:00
Alexandre BODIN
3401348146
Fix mongo error trying to cast from empty array (#6358) 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-26 14:29:43 +02:00
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
Riley Shea
4f2ded3c53
Erroneous double quote syntax error (#6257) 
Erroneous double quote in custom  extensions/documentation/config/settings.json example
 2020-05-25 18:33:09 +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