yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-01 21:03:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,053 Commits 113 Branches 491 Tags
Commit Graph

3850 Commits

Author SHA1 Message Date
markkaylor
efb2f1920b
Merge branch 'main' into feature/custom-field-default-options 2022-10-24 11:29:17 +02:00
Josh
bd1cf0137b
Merge branch 'main' into chore/webpack/fix-plugin-tsx 2022-10-24 10:10:24 +01:00
Josh
65351187e4 refactor: use path lib to make work across OS & add test 2022-10-24 10:08:36 +01:00
Gustav Hansen
756c4bcc04 SettingsPage: Fix prop-types 2022-10-24 10:34:15 +02:00
Gustav Hansen
223aac9af5 App: Extend theme extension tests and swallow deprecation message 2022-10-24 09:17:28 +02:00
Mark Kaylor
447b3c7621 Persist state using query params 2022-10-21 18:03:12 +02:00
Madhuri Sandbhor
13292ac68e updated constants in tests 2022-10-21 17:26:00 +02:00
Simone Taeggi
3e101fdbf1 fix read lifespan value 2022-10-21 16:27:43 +02:00
Simone Taeggi
66b9a303d0 Merge branch 'main' into fix/clean-test-warnings 2022-10-21 16:04:16 +02:00
Madhuri Sandbhor
a0e195c4d1 added package stats component 2022-10-21 16:02:47 +02:00
Mark Kaylor
c690aca913 Refactor and fix tests 2022-10-21 14:42:09 +02:00
Mark Kaylor
f96a07dae2 Merge branch 'market-sort-filters/sort-filter' of github.com:strapi/strapi into market-sort-filters/api-filter-requests 2022-10-21 14:02:40 +02:00
Mark Kaylor
f37d24c6ff wip 2022-10-21 10:40:26 +02:00
Gustav Hansen
394f72216a useTracking: Disable tracking if it was requested it to be disabled 2022-10-20 17:36:44 +02:00
Simone
75773d0010
Merge branch 'main' into fix/clean-test-warnings 2022-10-20 11:16:58 +02:00
Convly
65feb971b8 v4.4.5 2022-10-19 18:49:19 +02:00
Josh
1c3c3c1071 fix: use a dynamic list of exclude to allow TSX plugins to be transpiled 2022-10-19 15:15:42 +01:00
Convly
02f7b3b65d v4.4.4 2022-10-19 15:19:00 +02:00
Simone
22636e4819
Merge branch 'main' into fix/clean-test-warnings 2022-10-19 14:35:49 +02:00
Josh
2886064fda chore: remove tooltip.... 2022-10-19 13:35:02 +01:00
markkaylor
cff7677226
Merge branch 'main' into feature/custom-field-default-options 2022-10-19 14:27:36 +02:00
Josh
cbc6fec278 chore: amend conflict merge 2022-10-19 12:47:41 +01:00
Josh
31d9751266 Merge branch 'main' into feature/relations-main-view 2022-10-19 12:46:32 +01:00
Josh
563fc9b967
Merge pull request #14660 from strapi/chore/add-redux-devtools 2022-10-19 12:04:40 +01:00
Gustav Hansen
d1739d5891
Merge pull request #14120 from florianmrz/translate-field-label 
Use custom field labels in ListSettingsView component
 2022-10-19 12:44:34 +02:00
dependabot[bot]
f331c7f3b7
chore(deps): bump @fortawesome/fontawesome-svg-core from 6.1.2 to 6.2.0 
Bumps [@fortawesome/fontawesome-svg-core](https://github.com/FortAwesome/Font-Awesome) from 6.1.2 to 6.2.0.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/6.1.2...6.2.0)

---
updated-dependencies:
- dependency-name: "@fortawesome/fontawesome-svg-core"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-19 09:10:56 +00:00
Gustav Hansen
2e895d75ce choore: Update snapshot and integration tests 2022-10-19 11:09:15 +02:00
Julie Plantey
f0f1334c52
Merge pull request #14001 from WalkingPizza/feature/dark-theme-customization 
Dark theme customization
 2022-10-19 10:32:46 +02:00
Simone
6f8d995e38
Merge branch 'main' into fix/clean-test-warnings 2022-10-19 09:58:44 +02:00
Simone Taeggi
12fafb5b02 fix the apiToken default value inside the FormHead component 2022-10-19 09:47:43 +02:00
markkaylor
df59099eb9
Merge pull request #14554 from strapi/fix/custom-field-number-type 
[Custom fields] Fix number types
 2022-10-19 09:12:40 +02:00
Josh
46fcc9a149
Merge branch 'main' into chore/add-redux-devtools 2022-10-18 17:20:46 +01:00
Gustav Hansen
44ff77f466 chore: Update snapshot tests 2022-10-18 17:44:56 +02:00
Florian Merz
b70880d3e3 Use custom field labels in ListSettings 2022-10-18 17:24:12 +02:00
Josh
d4a653c684 chore: add redux dev-tools to launch in dev mode 2022-10-18 15:30:42 +01:00
Gustav Hansen
044ca89bdf chore: Update favicon new 2022 version 2022-10-18 13:59:01 +02:00
Kevin Antonio Rateni Iatauro
009956eae9
Merge branch 'main' into feature/dark-theme-customization 2022-10-18 12:39:44 +02:00
Mark Kaylor
0b68d106e0 Remove async 2022-10-18 10:46:13 +02:00
Simone Taeggi
a0a6f03788 Merge branch 'main' into fix/clean-test-warnings 2022-10-18 10:30:11 +02:00
Gustav Hansen
acea3d0028
Merge pull request #14647 from strapi/fix/tracking-error 
Fix: Catch all errors when sending tracking requests
 2022-10-18 10:28:22 +02:00
Simone Taeggi
1039e207c0 Merge branch 'main' into fix/clean-test-warnings 2022-10-18 10:24:07 +02:00
Gustav Hansen
6c9b6d6dea Fix: Catch all errors when sending tracking requests 2022-10-18 09:20:31 +02:00
WalkingPizza
16b8c96892 Remove lodash/get 2022-10-18 08:55:03 +02:00
WalkingPizza
feadbab092 Support plain theme customization and issue warning 2022-10-18 08:55:03 +02:00
WalkingPizza
b91a98835a Dark theme customization 2022-10-18 08:55:03 +02:00
markkaylor
228205e11a
Merge branch 'main' into feature/marketplace-strapi-version 2022-10-17 17:38:43 +02:00
Mark Kaylor
abccd36de6 Remove translation 2022-10-17 17:23:31 +02:00
Mark Kaylor
dcb6860126 Use fontsizes from ds 2022-10-17 17:22:59 +02:00
Mark Kaylor
d1902bd5be Use select again 2022-10-17 16:36:28 +02:00
Gustav Hansen
917029382f RelationInputDataManager: Test whether the state is stored 2022-10-17 15:09:58 +02:00