yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-05 23:40:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,807 Commits 112 Branches 487 Tags
Commit Graph

14807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derrick Mehaffy
63e02724c2 Add forum to header links on docs 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-09-24 07:01:46 -07:00
Derrick Mehaffy
a0424ec17d Move questions link to forums 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-09-24 07:00:31 -07:00
Alexandre BODIN
2e24b6f864
Merge pull request #8011 from strapi/forum 
Update all references from GHD to Forum
 2020-09-24 15:15:29 +02:00
Alexandre Bodin
4a27d9d46b Merge branch 'master' into documentation 2020-09-24 14:55:21 +02:00
Alexandre Bodin
3c7c33eab7 v3.1.6 v3.1.6 2020-09-24 14:51:49 +02:00
Alexandre BODIN
3a51ea83b4
Merge pull request #8027 from strapi/fix/analytics-registration 
Fix analytics registration bad info
 2020-09-24 14:46:56 +02:00
Alexandre BODIN
c97f33bf53
Merge pull request #7716 from strapi/fix/7699 
Fixes Admin bugs
 2020-09-24 14:41:10 +02:00
Alexandre Bodin
00c094d8f8 Fix analytics registration bad info 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-09-24 14:31:08 +02:00
Alexandre BODIN
aa8f30b58a
Update SocialLink.js 2020-09-24 14:28:53 +02:00
Alexandre BODIN
fb033314fe
Merge pull request #7999 from derappelt/patch-2 
Update services.md
 2020-09-24 09:47:58 +02:00
Diego Albitres
0670c896e3
Add privateAttributes to global and per model response (#7331) 
* Added privateAttributes globally and per model

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Added tests for sanitizeEntity

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Fixed broken test

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Added privateAttributes to GraphQL responses

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Added docs for privateAttributes

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Refactored and fixed PR comments

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Merged tests and fixed broken tests from merge

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Updated documentation for new option

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Refactored GraphQL implementation

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Fixed PR comments

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Fixed tests for sanitize-entity

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Removed code and tests for ignorePrivateFor

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Exported getPrivateAttributes for GraphQL plugin

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Removed ignorePrivateFor from docs

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>
 2020-09-24 09:40:10 +02:00
dependabot[bot]
6b1ac6e91d
Bump request-promise-native from 1.0.8 to 1.0.9 (#8018) 
Bumps [request-promise-native](https://github.com/request/request-promise-native) from 1.0.8 to 1.0.9.
- [Release notes](https://github.com/request/request-promise-native/releases)
- [Commits](https://github.com/request/request-promise-native/compare/v1.0.8...v1.0.9)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-24 09:37:43 +02:00
Alexandre BODIN
9480a906be
Merge pull request #8019 from strapi/deps/bump-buffet-stable 
Bump buffet.js to 3.3.0
 2020-09-24 09:33:58 +02:00
soupette
fa762abee7 Bump buffet.js to stable version 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-24 08:36:26 +02:00
Simon Appelt
8254aca5f2
Bugfix to last commit 2020-09-23 18:35:16 +02:00
Simon Appelt
c9fe16d38c
Update services.md 
I updated the code so it looks more like the strapi internal implementation.
https://github.com/strapi/strapi/blob/master/packages/strapi/lib/services/entity-service.js#L65
 2020-09-23 18:31:29 +02:00
Alexandre Bodin
90761175f6 Merge branch 'master' into features/draft-publish 2020-09-23 18:19:26 +02:00
Derrick Mehaffy
7ecf2d74b8 Update all references from GHD to Forum 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-09-23 08:49:42 -07:00
Pierre Noël
a138695d95
fix missing hasTimestamp (#8010) 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-09-23 17:49:28 +02:00
cyril lopez
71204a53bd
Merge pull request #8009 from strapi/fix/wrong-props 
Fix/wrong props
 2020-09-23 17:28:14 +02:00
soupette
6020c8e7e5 Upgrade buffet.js rc.5 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-23 17:20:24 +02:00
soupette
a0dfa14f04 fix wrong props 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-23 16:56:18 +02:00
soupette
d44bc98e20 Fix alias 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-23 15:14:12 +02:00
cyril lopez
7a19c3b425
Merge pull request #8005 from strapi/fix/deps 
Fix dependencies
 2020-09-23 14:40:34 +02:00
soupette
30a3d85056 Add buffetjs to all package dependencies 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-23 14:35:56 +02:00
Rémi de Juvigny
3b0e02fe00 Autofix yarn.lock conflict 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-09-23 14:25:55 +02:00
soupette
ab1587a049 Upgrade buffetjs 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-23 12:20:29 +02:00
Adam
94f3b24ee2
feat(server): allow listening on unix socket through server.socket config (#7824) 
* feat(server): allow listening on unix socket through `server.socket` configuration

Signed-off-by: Adam Lee <duo1123@gmail.com>

* docs(server): documentation for socket config

Signed-off-by: Adam Lee <duo1123@gmail.com>
 2020-09-23 11:59:31 +02:00
dependabot[bot]
e1875f0616
Bump react-helmet from 6.0.0 to 6.1.0 (#8001) 
Bumps [react-helmet](https://github.com/nfl/react-helmet) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/nfl/react-helmet/releases)
- [Changelog](https://github.com/nfl/react-helmet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nfl/react-helmet/compare/6.0.0...6.1.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-23 11:48:30 +02:00
Simon Appelt
510556b5b5
Update services.md 
Added entityValidator to create and update service, so it act like the default service and doesn't throw a 500 Error on invalid data.
 2020-09-23 09:34:38 +02:00
Christopher Wray
a0705063b5
Updated Models Page Grammar (#7912) 
* Updated Models Page Grammar

Quickly went through the models' page in the documentation and updated some grammar as well as added some emphasis and brief clarification in a couple of places.

* Edited slight typo.

* Updated Models Page Grammar

Quickly went through the models' page in the documentation and updated some grammar as well as added some emphasis and brief clarification in a couple of places.

Signed-off-by: Christopher Wray <53663762+cwray-tech@users.noreply.github.com>

* Edited slight typo.

Signed-off-by: Christopher Wray <53663762+cwray-tech@users.noreply.github.com>
 2020-09-22 19:28:32 -07:00
Pierre Noël
0b4eeb4fef fix rebase 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-09-22 19:31:02 +02:00
soupette
c04349a027 Fix Pr feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:46:01 +02:00
soupette
a7ebb1d6ca Fix wrong display 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:46:01 +02:00
Convly
d1b543f5cf Fix unwanted extension folder creation for admin schemas 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-09-22 17:46:00 +02:00
soupette
a5cd2fe6d1 Fix target attribute change when restricted relations 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:46:00 +02:00
soupette
b6e6f7cbbd Fix relation display 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:45:59 +02:00
Pierre Noël
7221412d68 Draft publish/validators (#7853) 
* add validators for dz, components and relations

Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-09-22 17:45:59 +02:00
soupette
1e56fe81a9 Update snapshots 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:45:58 +02:00
soupette
7af5408b1a Upgrade buffet.js 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:45:57 +02:00
Jean-Sébastien Herbaux
c4716d5668 [D&P] Return published content by default from get apis (#7657) 
* Add _publicationState request param / Returns live by default for CT that have D&P activated

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-09-22 17:39:46 +02:00
Pierre Noël
f7bd0886bb add options 'editable' and 'restrictRelationsTo' in CTB (#7768) 
* add options 'editable' and 'restrictRelationsTo' in CTB

Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-09-22 17:39:46 +02:00
soupette
e10452c245 Fix navigation between relations 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:45 +02:00
soupette
92a43a8152 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:45 +02:00
soupette
ccebd4f4b1 Fix relation link with admin users 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:44 +02:00
soupette
6718a12242 Allow to create relations with the admin users 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:44 +02:00
soupette
02c5502cbd Prevent non editable models from being displayed in the ctb left menu 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:43 +02:00
Pierre Noël
4652f2083c refacto expect.toBeISOString 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-09-22 17:39:43 +02:00
Pierre Noël
cfba8f2489 fix tests 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-09-22 17:39:42 +02:00
Pierre Noël
8862f2b75d add test for route relation-list with many to many 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-09-22 17:39:42 +02:00