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
21,245 Commits 122 Branches 507 Tags
Commit Graph

895 Commits

Author SHA1 Message Date
Convly
4fa2804f35 Merge branch 'master' into features/typescript 2022-04-15 15:47:16 +02:00
soupette
9a052ee876 Fix tests 
Signed-off-by: soupette <cyril@strapi.io>
 2022-04-13 17:15:16 +02:00
Alexandre Bodin
3f204a0a48 v4.1.8 2022-04-13 16:45:31 +02:00
Gustav Hansen
23a28790a9
Merge pull request #13067 from rshrj/add-sanskrit-i18n 
Added Sanskrit (sa) to i18n locales
 2022-04-11 14:01:03 +02:00
Gustav Hansen
c839306ff5 chore: Update snapshot tests 2022-04-11 12:35:29 +02:00
Gustav Hansen
9acc596fbe
Merge pull request #13037 from Solnur/add-kyrgyz-tajik-languages 
Add kyrgyz tajik languages
 2022-04-11 12:30:13 +02:00
Pierre Noël
54fda9c7c0 change error messages 2022-04-07 16:50:20 +02:00
Pierre Noël
89221e8ee9 fix wording mistakes 2022-04-07 16:50:19 +02:00
Pierre Noël
20e6d9a94b Improve error messages 2022-04-07 16:50:15 +02:00
Pierre Noël
019007ba3e improve error message + remove use of API_TOKEN_SALT 2022-04-07 16:34:57 +02:00
Pierre Noël
9fc63af260 harmonize secret generation + don't generate in production mode 2022-04-07 16:34:56 +02:00
Kai-Siang Wang
d4bb046b4c
Merge branch 'master' into feat/purest@4 2022-04-06 20:07:01 +08:00
Rishi Raj
ef39bdc5e8
Added Sanskrit (sa) to i18n locales 2022-04-06 12:55:36 +05:30
soupette
db37b4063b Fix documenation plugin 
Signed-off-by: soupette <cyril@strapi.io>
 2022-04-05 11:15:28 +02:00
Convly
84d106e7f8 Use new dirs (app/dist) 2022-04-04 11:46:22 +02:00
soupette
867cf185d7 Remove tsconfig.json in plugins 
Signed-off-by: soupette <cyril@strapi.io>
 2022-04-04 11:26:34 +02:00
soupette
58f2e7536d Add webpack config for TS and created tsconfig.json files for all plugins to enable TS in the admin 
Signed-off-by: soupette <cyril@strapi.io>
 2022-04-04 11:26:33 +02:00
solnur
9de5cb4d60 feat: add snapshot kyrgyz and tajik languages 2022-04-01 17:17:02 +06:00
solnur
0c1123b971 feat: add kyrgyz and tajik languages 2022-04-01 17:14:27 +06:00
Alexandre Bodin
1699aac151 v4.1.7 2022-03-31 17:53:39 +02:00
Kai-Siang Wang
c2940f44df
Merge branch 'master' into feat/purest@4 2022-03-31 23:24:11 +08:00
Alexandre Bodin
f25774168c v4.1.6 2022-03-30 15:34:12 +02:00
Kai-Siang Wang
7443c433f2 fix: solve github return undefined 2022-03-30 13:57:50 +08:00
Kai-Siang Wang
95879d9c17 feat: upgrade purest package to v4 2022-03-30 13:57:49 +08:00
Gustav Hansen
8aaaff77d4 Chore: Prettify all files 2022-03-29 14:20:41 +02:00
Jean-Sébastien Herbaux
3bf25de33e
Merge pull request #12815 from surgeharb/master 
fix: ApolloServer middleware CORS issue
 2022-03-24 16:51:44 +01:00
Alexandre Bodin
5cbb60ce4b Merge branch 'master' into releases/4.2.0 2022-03-24 11:11:00 +01:00
vincentbpro
7399fd3572 reorder translation files 2022-03-23 13:29:24 +01:00
vincentbpro
6d7071bc5f Merge branch 'master' into feat/translations-cleanup 2022-03-23 13:28:47 +01:00
Pierre Noël
6df5d8d11f
Merge pull request #12771 from marlonbaeten/master 
Add SERVER_URL variable to user e-mail templates
 2022-03-21 14:44:59 +01:00
Marlon Baeten
03028a763f Added ADMIN_URL to email templates 2022-03-21 11:04:54 +01:00
Alexandre Bodin
f1859f0375 v4.1.5 2022-03-16 12:18:10 +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 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
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
vincentbpro
643ad2d97d reorder translation files 2022-03-15 10:27:05 +01:00
vincentbpro
e67067c584 merged duplicated tranlations using the interactive script 2022-03-15 10:25:43 +01:00
Mark Kaylor
3be69154de merge master and fix conflicts 2022-03-14 14:32:47 +01:00
Gustav Hansen
7994f879be chore: Update snapshot tests 2022-03-14 12:52:22 +01:00
ronronscelestes
93d08f3fdb Merge branch 'master' of https://github.com/strapi/strapi into features/dark-mode 2022-03-14 11:41:19 +01:00
Marlon
dbc8aae306
Fix getAbsoluteServerUrl import in auth.js 2022-03-14 10:09:49 +01:00
Serge Harb
90e0cc44ee fix: pass cors and bodyParserConfig for apollo mw 2022-03-11 20:17:51 +01:00
Gustav Hansen
2c8eb45683
Merge pull request #12725 from luanorlandi/fix/sanitize-date-query-param 
Fix sanitization of datetime type in query param
 2022-03-11 11:52:23 +01:00
Mark Kaylor
a58c2bc035 Merge branch 'master' of github.com:strapi/strapi into strapi-market-release 2022-03-11 11:08:17 +01:00
Alexandre BODIN
d86f0095cf
Merge pull request #12345 from WalkingPizza/fix/up-email-confirmation-user-not-found 
Handle user not found error in email confirmation
 2022-03-11 08:45:59 +01:00
Hung Viet Nguyen
e7ddcd3e28
Translate to Vietnamese 2022-03-11 09:21:49 +07:00
ronronscelestes
fb316d3824 Merge branch 'master' of https://github.com/strapi/strapi into features/dark-mode 2022-03-10 18:20:50 +01:00
ronronscelestes
39c02e9723
Merge pull request #12807 from strapi/bump/ds-alpha-77 
Bump DS alpha.78 (no breaking changes)
 2022-03-10 18:06:12 +01:00