yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-03 19:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,587 Commits 122 Branches 507 Tags
Commit Graph

23587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julie Plantey
43d372413d
Merge pull request #14100 from rogix/feat/update-pr-br-translation 
Update pt-BR translation
 2022-08-24 10:33:39 +02:00
Ben Irvin
412f21e973 token doesn't authorize when expired 2022-08-24 10:32:24 +02:00
Gustav Hansen
435645638e
Merge pull request #14182 from strapi/fix/cm-edit-settings-view-tests 
CM: Fix test errors for EditSettingsView
 2022-08-24 10:30:53 +02:00
Simone Taeggi
4a84c231f0 Merge branch 'features/api-token-v2' into api-token-v2/last-activity-of-an-api-token 2022-08-24 10:30:22 +02:00
Simone Taeggi
368a8b6c23 Merge branch 'features/api-token-v2' into api-token-v2/api-tokens-design-details 2022-08-24 10:29:24 +02:00
Simone Taeggi
73dc47ba68 Merge branch 'features/api-token-v2' into api-token-v2/settings-access-api-token 2022-08-24 10:28:43 +02:00
Simone Taeggi
20529f4a97 Merge branch 'features/api-token-v2' into api-token-v2/change-primary-button-size-on-api-token-list 2022-08-24 10:26:47 +02:00
Simone Taeggi
9114494d80 Merge branch 'main' into features/api-token-v2 2022-08-24 10:26:14 +02:00
Ben Irvin
98d82a0285 fix tests 2022-08-24 10:01:36 +02:00
Gustav Hansen
78af3ebe62
Merge pull request #13872 from strapi/feature/amplitude-arch 
Add tracking property for os.arch() to Amplitude / Sentry (project creation)
 2022-08-24 09:46:39 +02:00
Simone Taeggi
94ac99ebec Merge branch 'features/api-token-v2' into api-token-v2/last-activity-of-an-api-token 2022-08-24 09:39:04 +02:00
Simone Taeggi
8a66474297 Merge branch 'features/api-token-v2' into api-token-v2/api-tokens-design-details 2022-08-24 09:38:16 +02:00
Simone Taeggi
14866143d1 Merge branch 'features/api-token-v2' into api-token-v2/notification-text-save-button-triggered 2022-08-24 09:37:37 +02:00
Simone Taeggi
1cb18d767e Merge branch 'features/api-token-v2' into api-token-v2/change-primary-button-size-on-api-token-list 2022-08-24 09:36:45 +02:00
Simone Taeggi
9f634ac98f Merge branch 'features/api-token-v2' into api-token-v2/settings-access-api-token 2022-08-24 09:35:42 +02:00
Ben Irvin
43465af282 improve lifespan validation 2022-08-24 09:10:30 +02:00
Ben Irvin
3850c9452b Merge branch 'features/api-token-v2' into api-token-v2/backend-expirations 2022-08-24 09:00:04 +02:00
Ben Irvin
af6e7d8f41
Merge pull request #14145 from strapi/api-token-v2/regenerate-tokens-api 
Api token v2/regenerate tokens api
 2022-08-23 23:06:00 +02:00
Ben Irvin
c0bb3a6014
Merge pull request #14164 from strapi/api-token-v2/fix-syncActions 
Api token v2/fix sync actions
 2022-08-23 23:04:59 +02:00
Ben Irvin
6d4bf5e4b2 Merge branch 'features/api-token-v2' into api-token-v2/fix-syncActions 2022-08-23 21:04:51 +02:00
Ben Irvin
9bc73368c4
Merge pull request #14181 from strapi/api-token-v2/fix-failing-e2e-tests 
fix test
 2022-08-23 21:01:00 +02:00
Gustav Hansen
cd1604968c
Merge pull request #14177 from strapi/fix/locale-select-test 
chore: Fix and simplify LocaleSelect tests
 2022-08-23 20:37:31 +02:00
Gustav Hansen
43a81dd943 CM: Fix test errors for EditSettingsView 2022-08-23 20:36:19 +02:00
Ben Irvin
d4c3c6e9af Merge branch 'api-token-v2/fix-failing-e2e-tests' into api-token-v2/regenerate-tokens-api 2022-08-23 20:18:13 +02:00
Ben Irvin
0b8ecaaccb sort permissions to compare 2022-08-23 20:08:45 +02:00
Ben Irvin
5085f5ed45 actually fix test 2022-08-23 19:19:56 +02:00
Ben Irvin
353efdf84c fix test 2022-08-23 18:28:34 +02:00
Bassel Kanso
8231bb905a
Merge pull request #14061 from strapi/fix/service-typings 
Fix service typings
 2022-08-23 19:01:51 +03:00
Ben Irvin
205c909885 fix failing test 2022-08-23 17:59:06 +02:00
Simone Taeggi
e3174b8a72 add the access permission in the main array 2022-08-23 17:38:54 +02:00
Ben Irvin
97f91dd7a5 fix failing tests 2022-08-23 17:24:29 +02:00
Bassel Kanso
48188bdf36 Merge branch 'main' into fix/service-typings 2022-08-23 18:14:14 +03:00
Convly
3944677650 Add unit tests for the content-api permissions 2022-08-23 17:10:10 +02:00
Convly
f3c1812e00 Remove useless warning 2022-08-23 17:09:48 +02:00
Gustav Hansen
4eb360c720
Merge pull request #14172 from strapi/dependabot/npm_and_yarn/react-intl-5.25.1 
Bump react-intl from 5.20.2 to 5.25.1
 2022-08-23 17:09:08 +02:00
Gustav Hansen
be53440a97 CM: Fix test errors in ListSettingsView 2022-08-23 16:51:06 +02:00
Gustav Hansen
c39dfda5e3 chore: Fix and simplify LocaleSelect tests 2022-08-23 16:50:48 +02:00
Gustav Hansen
95575e4a1c
Merge pull request #14179 from strapi/fix/eslint-main 
Documentation: Fix eslint errors
 2022-08-23 16:50:08 +02:00
Simone Taeggi
3e7a45fdb8 define a new action to prevent the access of the api token page in the settings 2022-08-23 16:27:26 +02:00
Bassel Kanso
4fd4c7f8ac Merge branch 'main' into fix/service-typings 2022-08-23 17:22:03 +03:00
Bassel Kanso
7b6ca0ad4e Merge branch 'main' into fix/service-typings 2022-08-23 17:14:37 +03:00
Bassel Kanso
326e2ed566 fix generic service typings 2022-08-23 17:14:26 +03:00
Convly
1d6b42efbe Use local instance of strapi instead of the global 2022-08-23 16:05:47 +02:00
Convly
6abea9cd85 Expose "get actions as map" & update sync actions 
Co-authored-by: Ben Irvin <innerdvations@users.noreply.github.com>
 2022-08-23 16:02:45 +02:00
Gustav Hansen
365bcf3014 Documentation: Fix eslint errors 2022-08-23 15:58:05 +02:00
Gustav Hansen
18e60778cc Documentation: Fix eslint errors 2022-08-23 15:51:04 +02:00
Gustav Hansen
bd14f60980
Merge pull request #14175 from strapi/fix/test-prop-types 
chore: Fix some test errors
 2022-08-23 15:44:22 +02:00
Ben Irvin
7e446b7414 add token usage tests 2022-08-23 15:04:24 +02:00
Simone Taeggi
1add0f07fa change the save button size inside the api tokens page 2022-08-23 15:01:25 +02:00
markkaylor
f5a62af92b
Merge pull request #13458 from meganoob1337/strapi/fix/issue-13453-documentation-fix 
fix #13453 Documentation Plugin doesn't generate Proper Type for the …
 2022-08-23 14:57:15 +02:00