19714 Commits

Author SHA1 Message Date
tillschweneker
ac0c306a0b [FIX] respect custom ENV_PATH when setting API_TOKEN_SALT 2021-12-22 10:08:47 +01:00
Alexandre BODIN
7e1ef71d9b
Merge pull request #11973 from strapi/watch-mode
Remove admin files from watched files
2021-12-22 09:11:15 +01:00
Alexandre BODIN
2be212cd6f
Merge pull request #11969 from iicdii/fix/api-token-popluate
Fix relations are not populated when API key is read-only
2021-12-22 09:09:02 +01:00
Alexandre BODIN
11b078bd55
Merge pull request #11944 from maximeMD/master
Add missing french translations
2021-12-22 09:03:53 +01:00
Kim, Harim
ea95e740c1
Merge branch 'master' into fix/api-token-popluate 2021-12-22 07:15:13 +09:00
soupette
d24fe52a89 Remove admin files from watched files
Signed-off-by: soupette <cyril@strapi.io>
2021-12-21 17:22:10 +01:00
Maxime Marty-Dessus
ae916f95e4
Merge branch 'master' into master 2021-12-21 14:42:40 +01:00
harimkims
a926999b29 Fix relations are not populated if API key is read-only
Signed-off-by: harimkims <harimkims@gmail.com>
2021-12-21 22:37:43 +09:00
Kim, Harim
93de45cc2e
Add test for Content API filter by locale (#11961)
* Fix unable to filter by locale

Signed-off-by: harimkims <harimkims@gmail.com>

* Fix failed e2e test

* Revert modifying decorator test, Add locale filter key

* Revert supporting both locale, _locale format

* Replace _locale with locale

* Replace _locale params with locale in test

* Rename testing for default locale filtering

Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
2021-12-21 13:43:25 +01:00
Kim, Harim
bd0aa9e9f5
Fix unable to reset password in GraphQL mutation (#11964)
Signed-off-by: harimkims <harimkims@gmail.com>
2021-12-21 11:45:18 +01:00
Maxime Marty-Dessus
b6b7ff702d update translation in en.json 2021-12-21 11:05:20 +01:00
Maxime Marty-Dessus
f7c47785ba
Merge branch 'strapi:master' into master 2021-12-20 23:52:13 +01:00
Alexandre BODIN
4497124c87
Merge pull request #11933 from meduzen/patch-1
Fix English grammar in test files
2021-12-20 17:41:17 +01:00
Alexandre BODIN
be89f1505b
Merge pull request #11924 from duncanhsieh/master
Translate en.json into traditional Chinese.
2021-12-20 17:40:26 +01:00
Alexandre BODIN
b6bc048bb0
Merge pull request #11954 from strapi/serve-admin
Build admin only when necessary and serve it from the admin package
2021-12-20 17:29:33 +01:00
ELABBASSI Hicham
04299a1bdf
Merge pull request #11950 from SlavMAK/fix-display-error-in-admin-panel
fix error message in admin panel
2021-12-20 17:16:11 +01:00
cyril lopez
9ee74de88c
Update packages/core/strapi/lib/commands/build.js
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
2021-12-20 16:24:42 +01:00
soupette
1db862161b Use script to build the admin when developing
Signed-off-by: soupette <cyril@strapi.io>
2021-12-20 15:51:19 +01:00
soupette
9a88eac51e Remove doc files
Signed-off-by: soupette <cyril@strapi.io>
2021-12-20 15:08:02 +01:00
soupette
584347e4bb Use default build
Signed-off-by: soupette <cyril@strapi.io>
2021-12-20 14:56:06 +01:00
soupette
3fae2a3fca Fix conflicts
Signed-off-by: soupette <cyril@strapi.io>
2021-12-20 14:02:31 +01:00
MuxauJl
195fa88cfa fix 2021-12-20 17:45:49 +07:00
Maxime Marty-Dessus
d9ec72af44 update welcome message 2021-12-18 23:35:11 +01:00
Maxime Marty-Dessus
b935c3b7f9 fix some mistakes 2021-12-18 23:19:24 +01:00
Maxime Marty-Dessus
4a8e47ddf3 fix plural logic 2021-12-18 20:50:15 +01:00
Maxime Marty-Dessus
c7eaa37edd remove duplicate in en.json 2021-12-18 20:46:55 +01:00
Maxime Marty-Dessus
aabeca7ece add all missing entries to fr.json 2021-12-18 20:46:51 +01:00
Mehdi
272ca8634a
Fix English grammar in test files 2021-12-17 04:10:22 +01:00
Alexandre BODIN
12333ebea6
Merge pull request #11926 from strapi/update/DBRequirements
Update required database versions
2021-12-16 09:49:53 +01:00
Alexandre BODIN
34d9b2e16d
Merge pull request #11873 from abdonrd/created-by
Show creation information in the detail view
2021-12-16 09:47:09 +01:00
derrickmehaffy
881c4eecae Update required database versions
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
2021-12-15 14:10:13 -07:00
Duncan Hsieh
8c3c28a5af Translate en.json into traditional Chinese. 2021-12-16 00:40:28 +08:00
Abdón Rodríguez Davila
7accd9908f
Merge branch 'master' into created-by 2021-12-15 17:29:13 +01:00
Abdón Rodríguez Davila
b990a4227b Update snapshot
Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>
2021-12-15 17:28:44 +01:00
Alexandre BODIN
459c0e941c
Merge pull request #11915 from strapi/fix/11908
Fix copy from another locale with DZ
2021-12-15 17:14:44 +01:00
soupette
1618d2313f Fixes #11908
Signed-off-by: soupette <cyril@strapi.io>
2021-12-15 15:32:42 +01:00
Abdón Rodríguez Davila
bedddcedae
Merge branch 'master' into created-by 2021-12-15 11:35:35 +01:00
Alexandre BODIN
13e3e59f7d
Merge pull request #11883 from strapi/entity-validator-unit-tests
Add unit tests for the entity validators
2021-12-15 10:53:31 +01:00
Alexandre BODIN
0c03cbe793
Merge pull request #11870 from matsubaraDaisuke/test/pxToRem
add test of pxToRem
2021-12-15 09:46:38 +01:00
Alexandre BODIN
687eb623e9
Merge pull request #10968 from strapi/chore/test-config
Rework test config to get a better monorepo experience
2021-12-14 17:34:00 +01:00
Alexandre BODIN
6c24b61389
Merge pull request #11901 from strapi/use-asset-module
Replace file-loader and url-loader with asset modules
2021-12-14 17:32:46 +01:00
Fabien del Carmen
66ca7b2f4f
Merge branch 'master' into chore/test-config 2021-12-14 16:32:01 +01:00
Alexandre BODIN
3fca25601b
Merge pull request #11795 from iicdii/fix/11789
Fix unable to filter users, add e2e test
2021-12-14 15:58:43 +01:00
Alexandre BODIN
331c21a0a6
Merge pull request #11884 from strapi/fix-product-copy-text-changes-v1
style: email settings text change
2021-12-14 15:58:03 +01:00
Alexandre BODIN
903f8e15e5
Merge pull request #11898 from strapi/fix/11845
Fix relation field in the content manager.
2021-12-14 15:57:50 +01:00
MatsubaraDaisuke
07e98fe5e9
Merge branch 'master' into test/pxToRem 2021-12-14 23:57:16 +09:00
Alexandre BODIN
8ae6fd5ae7
Merge branch 'master' into chore/test-config 2021-12-14 15:56:27 +01:00
Alexandre BODIN
68bce2dba9
Merge pull request #11830 from matsubaraDaisuke/matsubara-japanese-translation-fix
Update ja.json
2021-12-14 15:56:16 +01:00
Alexandre BODIN
a7ddc34d4e
Merge branch 'master' into fix/11789 2021-12-14 14:11:50 +01:00
Alexandre BODIN
30db467072
Merge pull request #11850 from yuku/fix-11848
Dealing with dependencies which don't export package.json
2021-12-14 14:06:15 +01:00