449 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
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
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
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
Alexandre Bodin
5cbb60ce4b Merge branch 'master' into releases/4.2.0 2022-03-24 11:11:00 +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
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
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
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
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
Kevin Antonio Rateni Iatauro
ba73a398dd
Removed user not found error 2022-03-10 17:51:47 +01:00
Alexandre BODIN
497516716f
Merge pull request #12644 from iicdii/feature/allow-all-uri-schemes-in-reset-pw
Allow all URI schemes for setting reset password page
2022-03-10 15:41:41 +01:00
ronronscelestes
524067fc44 Merge branch 'master' of https://github.com/strapi/strapi into features/dark-mode 2022-03-10 15:11:44 +01:00
HichamELBSI
e89098da42 Bump DS alpha.77 (no breaking changes)
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
2022-03-10 15:06:30 +01:00
harimkims
29081d0fd3 Add tests to verify schema 2022-03-10 22:41:39 +09:00
Kevin Antonio Rateni Iatauro
39db68bcbf
Merge branch 'strapi:master' into fix/up-email-confirmation-user-not-found 2022-03-10 11:39:47 +01:00
Alexandre BODIN
94569e5e36
Merge pull request #12193 from abdonrd/split-auth-providers
[v4] Split providers and grant config to a new files
2022-03-10 09:37:33 +01:00
Alexandre BODIN
e1a7bc9458
Merge pull request #12672 from aquadesk/fix-placeholder
fix: placeholder for email confirmation link input
2022-03-09 18:20:06 +01:00
Alexandre Bodin
8549f5aca3 v4.1.3 2022-03-08 19:28:44 +01:00
Kevin Antonio Rateni Iatauro
bf87b566c8
Merge branch 'strapi:master' into fix/up-middleware-config-override 2022-03-08 18:45:36 +01:00
Marlon Baeten
2e7acfce8d Added SERVER_URL to allowed template variables 2022-03-07 16:15:48 +01:00
Marlon Baeten
1028fefb7f Add SERVER_URL variable to user e-mail templates 2022-03-07 16:08:47 +01:00
Pierre Noël
3700b15f76
Merge pull request #12718 from strapi/fix/redirect-url-placeholder
add missing /api in redirectUrl placeholder
2022-03-03 15:19:14 +01:00
Pierre Noël
2e0a4d1507 add missing /api in redirectUrl placeholder 2022-03-02 16:05:05 +01:00
Alexandre Bodin
6f72c38052 v4.1.2 2022-03-02 16:01:32 +01:00
vincentbpro
1e21f7707a tests(dark-mode): updated snapshots 2022-02-28 13:42:37 +01:00