yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 08:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,829 Commits 127 Branches 497 Tags
Commit Graph

20829 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
e0fb1fe0f3 Speed up webpack config by using esbuild-loader 
Signed-off-by: soupette <cyril@strapi.io>
 2022-03-18 15:21:20 +01:00
Alexandre Bodin
6a55ba0e98 Merge branch 'releases/4.2.0' into features/typescript 2022-03-16 12:05:08 +01:00
Alexandre Bodin
a67311ee40 Merge branch 'master' into releases/4.2.0 2022-03-16 12:04:55 +01:00
soupette
14b525620b Fix redirection 
Signed-off-by: soupette <cyril@strapi.io>
 2022-03-16 12:03:44 +01:00
Alexandre Bodin
592ecb362e v4.2.0-beta.0 v4.2.0-beta.0 2022-03-16 11:51:42 +01:00
Alexandre Bodin
db70f0de7c Yarn lock 2022-03-16 11:39:23 +01:00
Alexandre Bodin
bf27699c63 Merge branch 'releases/4.2.0' into features/typescript 2022-03-16 11:37:27 +01:00
Alexandre Bodin
3a0fd5ca03 Merge branch 'master' into releases/4.2.0 2022-03-16 11:26:42 +01:00
Alexandre Bodin
01a565aeb6 v4.1.4 v4.1.4 2022-03-16 11:22:49 +01:00
Alexandre BODIN
8f3ac1d80e
Merge pull request #12812 from nvh95/add-missing-keys-to-translation 
Add missing keys to translation
 2022-03-16 11:12:22 +01:00
Alexandre BODIN
74949f6747
Merge pull request #12792 from strapi/CONTENT-50/ml-upload-copy 
Media Library: improve microcopy
 2022-03-16 11:09:29 +01:00
Alexandre BODIN
886250ae5d
Merge pull request #12206 from ComfortablyCoding/fix-plugin-generator-pluginId 
[v4] fix(plugin generator): support valid package names for pluginId
 2022-03-16 11:08:40 +01:00
cyril lopez
18deb30d20
Merge pull request #12856 from strapi/typescript/fix-lint-and-tests 
Typescript/fix lint and tests
 2022-03-16 10:31:07 +01:00
soupette
2356895c23 Add missing dependency 
Signed-off-by: soupette <cyril@strapi.io>
 2022-03-16 10:21:53 +01:00
soupette
5f8fddeb60 Merge branch 'releases/4.2.0' of github.com:strapi/strapi into features/typescript 2022-03-16 10:08:51 +01:00
cyril lopez
6bd6459e0c
Merge pull request #12854 from strapi/fix/redirection 
Fix redirection
 2022-03-16 10:08:23 +01:00
soupette
2a7d6533c4 Fix redirection 
Signed-off-by: soupette <cyril@strapi.io>
 2022-03-16 10:01:27 +01:00
daedalus
75178cc8be Merge branch 'master' into fix-plugin-generator-pluginId 2022-03-15 17:46:43 -04:00
Alexandre Bodin
723b601405 Merge branch 'releases/4.2.0' into features/typescript 2022-03-15 19:43:48 +01:00
Alexandre Bodin
e2a96d48a9 Merge branch 'master' into releases/4.2.0 2022-03-15 19:43:07 +01:00
Alexandre BODIN
6202b944ce
Merge pull request #12664 from strapi/strapi-market-release 
[Marketplace] Strapi market release
 2022-03-15 19:42:48 +01:00
Alexandre Bodin
755efce457 Fix missing dependency 2022-03-15 19:36:51 +01:00
Alexandre Bodin
0ec01b4219 Merge branch 'releases/4.2.0' into features/typescript 2022-03-15 19:28:38 +01:00
Alexandre BODIN
bc8132e525
Merge pull request #12662 from strapi/features/dark-mode 
Features/dark mode
 2022-03-15 19:25:46 +01:00
Alexandre Bodin
0095f4ec55 Update kitchensink-ts versions 2022-03-15 19:22:06 +01:00
Alexandre BODIN
569ed9197d
Merge pull request #12851 from strapi/typescript/develop-v2 
[Typescript] Develop rework
 2022-03-15 19:17:45 +01:00
soupette
0852f8f1ad Fix dev mode 
Signed-off-by: soupette <cyril@strapi.io>
 2022-03-15 19:09:44 +01:00
Convly
00abd419f2 Cleanup tsconfig & clean the dist dir before build 2022-03-15 18:43:19 +01:00
markkaylor
067d31a116
Merge pull request #12845 from strapi/fix/marketplace-qa 2022-03-15 17:30:24 +01:00
Gustav Hansen
80efa39a73
Merge pull request #12821 from nvh95/redirect-after-logged-in 
Preserve url if user's not logged in
 2022-03-15 17:09:15 +01:00
Convly
fd1de4fa14 Init new develop 2022-03-15 16:13:17 +01:00
Mark Kaylor
ff02e0a64b style the error component 2022-03-15 15:41:44 +01:00
ronronscelestes
3a3567a850
Merge pull request #12844 from strapi/dark-mode/fix-relation-select-fg-color 
Dark mode/fix relation select fg color
 2022-03-15 15:29:51 +01:00
Convly
f1d9ebec06 Minor fixes 2022-03-15 15:28:50 +01:00
Convly
b1fe71955f Update loader to support default syntax 2022-03-15 15:20:11 +01:00
Convly
876d4a52a8 Merge branch 'master' of github.com:strapi/strapi into features/typescript 2022-03-15 14:57:45 +01:00
cyril lopez
806d244933
Merge pull request #12847 from strapi/typescript/generators 
[Typescript] - Generators
 2022-03-15 14:32:45 +01:00
soupette
b1453666b4 Clean kitchensink-ts package.json 
Signed-off-by: soupette <cyril@strapi.io>
 2022-03-15 14:31:39 +01:00
cyril lopez
2a299a91d6
Merge pull request #12849 from strapi/typescript/add-tsconfig-admin 
Add tsconfig-admin.json to generators
 2022-03-15 14:28:47 +01:00
soupette
aa6eada62b Remove tslint config 
Signed-off-by: soupette <cyril@strapi.io>
 2022-03-15 14:28:18 +01:00
Alexandre BODIN
011cbdb10e
Merge pull request #12829 from strapi/fix/codecov-ignore 
Codecov: ignore md and mdx files
 2022-03-15 13:51:22 +01:00
soupette
7223064af3 Add tsconfig-admin.json to generators 
Signed-off-by: soupette <cyril@strapi.io>
 2022-03-15 13:50:08 +01:00
Jean-Sébastien Herbaux
8e1e20b0a1
Merge pull request #12839 from strapi/typescript/change-strapi-dirs 
Differenciate app and dist directories
 2022-03-15 12:57:34 +01:00
Mark Kaylor
926cfb2d37 update snapshot 2022-03-15 11:51:24 +01:00
Mark Kaylor
15f45183f4 replace size prop with spacing prop 2022-03-15 11:50:57 +01:00
ronronscelestes
8839e60137
Merge pull request #12793 from strapi/guided-tour/tracking 
feat(guided-tour): added tracking for the guided-tour
 2022-03-15 11:39:54 +01:00
Mark Kaylor
2994ebeca1 fix searchbar width 2022-03-15 11:37:52 +01:00
vincentbpro
ca8407fdad fix selected value text color 2022-03-15 11:34:55 +01:00
vincentbpro
8878805664 fix: using theme colors in relation select 2022-03-15 11:23:23 +01:00
Gustav Hansen
304c5cbf6e
Merge pull request #12194 from WalkingPizza/cli-admin-create-command 
Added admin:create-user command
 2022-03-15 11:19:20 +01:00