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

24134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc
14dfb3f706
Merge pull request #14228 from strapi/dependabot/npm_and_yarn/sqlite3-5.0.11 
Bump sqlite3 from 5.0.2 to 5.0.11
 2022-08-30 09:28:30 +02:00
Bassel Kanso
3aec1978f8 get permissions from backend 2022-08-29 23:06:14 +03:00
Convly
bf5534d725 Test consistency 2022-08-29 18:03:43 +02:00
Convly
dfad26d2a2 Fix test 2022-08-29 18:03:04 +02:00
Simone Taeggi
0085a895c2 Merge branch 'features/api-token-v2' into api-token-v2/regenerate-an-api-token 2022-08-29 17:56:39 +02:00
Pierre Noël
243c714652
Merge pull request #14124 from strapi/fix/populate-with-true 
Allow the use of 'true', 't', 'false', 'f', '1', '0' when populating a field in REST API
 2022-08-29 17:42:34 +02:00
Convly
e4b9dd5ab8 Simplify the delete request 2022-08-29 17:39:41 +02:00
Convly
a80e83d397 Remove console.log 2022-08-29 17:36:22 +02:00
Convly
f506369ce6 Sync permissions in DB with existing one, automatic cleanup on schema deletion 2022-08-29 17:32:41 +02:00
Ben Irvin
4bb8e1be34
Merge pull request #14230 from strapi/api-token-v2/restrict-lifespans 
Api token v2/restrict lifespans
 2022-08-29 17:28:20 +02:00
Julie Plantey
9496693a31
Merge pull request #14195 from WalkingPizza/fix/settings-button-sizes 
Make all settings header primary actions small
 2022-08-29 16:51:46 +02:00
Convly
e7ca50f6b9 Validate permissions for api-tokens & throw on unknown permissions 2022-08-29 16:33:41 +02:00
Pierre Noël
b17d1001c8 refactor DZ populate for better clarity 2022-08-29 16:15:09 +02:00
Julie Plantey
5a80b2ce6f LoadingMessage component for ReactSelect 2022-08-29 16:02:19 +02:00
Pierre Noël
6c4039e3f1 remove useless code 2022-08-29 15:22:47 +02:00
Simone Taeggi
82dd45f219 Merge branch 'features/api-token-v2' into api-token-v2/regenerate-an-api-token 2022-08-29 14:25:01 +02:00
Marc
9ef383acb3
Merge branch 'main' into dependabot/npm_and_yarn/sqlite3-5.0.11 2022-08-29 14:12:47 +02:00
Gustav Hansen
f6856af241
Merge pull request #14241 from strapi/chore/bump-ds-1-2-2 
Chore: Bump @strapi/design-system to 1.2.2
 2022-08-29 13:56:30 +02:00
Gustav Hansen
ecb3643ab5
Merge pull request #14178 from strapi/fix/list-settings-view-tests 
CM: Fix test errors in ListSettingsView
 2022-08-29 13:56:04 +02:00
Gustav Hansen
c4f77eee2d
Merge pull request #14240 from strapi/dependabot/npm_and_yarn/react-refresh-0.14.0 
Bump react-refresh from 0.11.0 to 0.14.0
 2022-08-29 12:54:16 +02:00
Marc
77d21da7c0
Merge branch 'main' into dependabot/npm_and_yarn/sqlite3-5.0.11 2022-08-29 12:38:02 +02:00
Ben Irvin
3cd1a9b183
Merge branch 'features/api-token-v2' into api-token-v2/restrict-lifespans 2022-08-29 12:37:53 +02:00
Ben Irvin
0213ee2e1a
Merge pull request #14238 from strapi/api-token-v2/rename-api-token-permission 
rename token-permission to api-token-permission
 2022-08-29 12:35:21 +02:00
Ben Irvin
b4c8cae41d
Merge pull request #14234 from strapi/api-token-v2/allow-empty-permissions-array 
allow empty array of permissions
 2022-08-29 12:34:57 +02:00
Gustav Hansen
c2419b5a0d chore: Update snapshot tests 2022-08-29 12:14:20 +02:00
Gustav Hansen
f05ad58f69 Chore: Bump @strapi/design-system to 1.2.2 2022-08-29 12:12:33 +02:00
Simone Taeggi
531e9babf2 fix lint error and the redirection after creation of a token 2022-08-29 11:58:51 +02:00
dependabot[bot]
c376fdcf94
Bump react-refresh from 0.11.0 to 0.14.0 
Bumps [react-refresh](https://github.com/facebook/react/tree/HEAD/packages/react) from 0.11.0 to 0.14.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v0.14.0/packages/react)

---
updated-dependencies:
- dependency-name: react-refresh
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-29 09:41:46 +00:00
Gustav Hansen
681e9dfce6
Merge pull request #14209 from strapi/dependabot/npm_and_yarn/storybook/addon-essentials-6.5.10 
Bump @storybook/addon-essentials from 6.5.9 to 6.5.10
 2022-08-29 11:41:38 +02:00
Simone Taeggi
c641c5d71d Merge branch 'features/api-token-v2' into api-token-v2/regenerate-an-api-token 2022-08-29 11:31:38 +02:00
Simone
4f7db2ef72
Merge pull request #14180 from strapi/api-token-v2/settings-access-api-token 
RBAC on API tokens settings access
 2022-08-29 11:30:26 +02:00
Simone
3f3ec98101
Merge pull request #14108 from strapi/api-token-v2/last-activity-of-an-api-token 
Add last activity column in the API tokens list
 2022-08-29 11:29:18 +02:00
Simone
8e73c40e86
Merge pull request #14174 from strapi/api-token-v2/notification-text-save-button-triggered 
Change notification message when we successfully save a created or edited token
 2022-08-29 11:28:51 +02:00
Ben Irvin
2dea049a8c fix test 2022-08-29 10:50:46 +02:00
Simone Taeggi
09cb0f42a6 add the regenerate logic 2022-08-29 10:40:32 +02:00
Ben Irvin
7ed24a9edf
Merge pull request #14192 from strapi/api-token-v2/regenerate-tokens-api 
Api Token v2/add regenerate controller tests
 2022-08-29 10:38:42 +02:00
Gustav Hansen
905300f6e1 CM: Fix i18n LocalePicker component 2022-08-29 10:35:45 +02:00
Kevin Antonio Rateni Iatauro
df30b7a6c1
Merge branch 'main' into fix/settings-button-sizes 2022-08-29 09:51:12 +02:00
WalkingPizza
a25d813b6c Update snapshots 2022-08-29 09:50:46 +02:00
Ben Irvin
9aed7d9540 rename token-permission to api-token-permission 2022-08-29 09:17:31 +02:00
Marc-Roig
b2abaa9018 Merge branch 'main' into fix/delete-components-when-deleting-entity 2022-08-29 09:08:59 +02:00
Simone Taeggi
0a5f5c1d86 Merge branch 'features/api-token-v2' into api-token-v2/regenerate-an-api-token 2022-08-28 17:13:21 +02:00
Simone Taeggi
d95151a556 fix Expiration date when unlimited lifespan and the initial value of the Token duration in creation 2022-08-28 17:10:18 +02:00
Marc-Roig
6f76aee4d7 check if there are no components 2022-08-27 20:30:59 +02:00
Marc-Roig
2200f279ab clean webhook tests 2022-08-27 14:15:11 +02:00
Adedoyin Akande
fae51fab10
Merge branch 'main' into add-locales 2022-08-27 09:48:49 +01:00
Pierre Noël
3327196cce remove populate false only for the rest api, not in db layer 2022-08-26 21:01:50 +02:00
Pierre Noël
69945fd9bb handle populate: false 2022-08-26 21:01:50 +02:00
Pierre Noël
0ab458fe0d Allow the use of true, t, false, f, 1, 0 in addition to * when populating a field 2022-08-26 21:01:50 +02:00
Alexandre BODIN
4a6cd39aa9
Merge pull request #13720 from strapi/fix/add-relational-pks 
Add primary keys to relational table
 2022-08-26 19:21:20 +02:00