yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-30 04:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,918 Commits 115 Branches 486 Tags
Commit Graph

870 Commits

Author SHA1 Message Date
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
Kevin Antonio Rateni Iatauro
ba73a398dd
Removed user not found error 2022-03-10 17:51:47 +01:00
Gustav Hansen
858b0b2080
Merge pull request #12714 from strapi/fix/json-string-field-publish 
Fix json field not validated on publish
 2022-03-10 16:38:16 +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
Pierre Noël
2a381562bb Fix json field not validated on publish 2022-03-10 15:22:06 +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
Alexandre BODIN
07ef03bfd5
Merge pull request #12654 from EarMaster/EarMaster-i18n-translation-de 
German translation (i18n)
 2022-03-10 14:42:03 +01:00
harimkims
29081d0fd3 Add tests to verify schema 2022-03-10 22:41:39 +09:00
Alexandre BODIN
3ebdfdae5d
Merge pull request #12675 from alexgrozav/master 
fix documentation plugin paths builder when multiple contentTypes
 2022-03-10 14:37:35 +01:00
Gustav Hansen
9fe8ae3188 i18n: Improve German translations 2022-03-10 13:54:44 +01: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
Gustav Hansen
5788477ee6 Update packages/plugins/i18n/admin/src/translations/de.json 2022-03-10 10:28:30 +01:00
Gustav Hansen
549fa35c2e Update packages/plugins/i18n/admin/src/translations/de.json 2022-03-10 10:28:30 +01:00
Gustav Hansen
184bbb0b8b Update packages/plugins/i18n/admin/src/translations/de.json 2022-03-10 10:28:29 +01:00
Gustav Hansen
6f7fbda38d Update packages/plugins/i18n/admin/src/translations/de.json 2022-03-10 10:28:29 +01:00
Gustav Hansen
9913b126f4 Update packages/plugins/i18n/admin/src/translations/de.json 2022-03-10 10:28:29 +01:00
Gustav Hansen
50ec772423 Update packages/plugins/i18n/admin/src/translations/de.json 2022-03-10 10:28:29 +01:00
Gustav Hansen
b8990bb4a7 Update packages/plugins/i18n/admin/src/translations/de.json 2022-03-10 10:28:29 +01:00
Gustav Hansen
f7a3e8ee23 Update packages/plugins/i18n/admin/src/translations/de.json 2022-03-10 10:28:28 +01:00
Gustav Hansen
1a11634031 Update packages/plugins/i18n/admin/src/translations/de.json 2022-03-10 10:28:28 +01:00
Gustav Hansen
1c40912e01 Update packages/plugins/i18n/admin/src/translations/de.json 2022-03-10 10:28:28 +01:00
Gustav Hansen
bb9c69f3d0 Update packages/plugins/i18n/admin/src/translations/de.json 2022-03-10 10:28:28 +01:00
Gustav Hansen
be3104e250 Update packages/plugins/i18n/admin/src/translations/de.json 2022-03-10 10:28:28 +01:00
Gustav Hansen
b161086801 Update packages/plugins/i18n/admin/src/translations/de.json 
Co-authored-by: Nico Hofmair <NicoHof@users.noreply.github.com>
 2022-03-10 10:28:27 +01:00
Gustav Hansen
3433e2dac2 Update packages/plugins/i18n/admin/src/translations/de.json 
Co-authored-by: Nico Hofmair <NicoHof@users.noreply.github.com>
 2022-03-10 10:28:27 +01:00