yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-26 14:44:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,470 Commits 138 Branches 514 Tags
Commit Graph

14470 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
HichamELBSI
a2a31ce8df Fix Role edit alignment (Permission's list) 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-09-25 12:19:31 +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
Alexandre Bodin
90761175f6 Merge branch 'master' into features/draft-publish 2020-09-23 18:19:26 +02: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
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
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
Pierre Noël
23acc65810 remove console.log 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-09-22 17:39:41 +02:00
Pierre Noël
e553467d55 refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-09-22 17:39:41 +02:00
Pierre Noël
09ae61ffab fix tests 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-09-22 17:39:40 +02:00
Pierre Noël
74a85c1127 Add migration d&p 2020-09-22 17:39:40 +02:00
soupette
6ac3034a70 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:39 +02:00
soupette
296d26c46b Update CM trads 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:39 +02:00
soupette
3a21b38c50 Change confirm trad for popupwarning 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:38 +02:00
soupette
565b932a9e Add confirmation when disabling the D&P feature on a ct. 
Clean trads

Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:37 +02:00
soupette
c4b9bf45ee Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:37 +02:00
soupette
ffabc56fee Hide D&P events when not needed 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:37 +02:00
soupette
97242b3ebc Fix wrong css property 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:36 +02:00
soupette
e6cd132b6d Fix select background 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:36 +02:00
soupette
d08a392bb2 Created custom modal warning 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:35 +02:00
soupette
1fb475e7a9 Clean popupwarning 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:35 +02:00
soupette
cc00789a66 Fix perfs 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:34 +02:00
soupette
5a6d9a89b8 Created utility to get draft relations 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:34 +02:00
soupette
28bc1959c4 Fix read only mode 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-22 17:39:33 +02:00