MatsubaraDaisuke
07e98fe5e9
Merge branch 'master' into test/pxToRem
2021-12-14 23:57:16 +09: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
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
Alexandre BODIN
12852dd36c
Merge pull request #11479 from strapi/v4/fix-fetch-all-entries
...
Fetch all entries with limit -1
2021-12-14 14:04:26 +01:00
Alexandre BODIN
940fb3c088
Merge pull request #11802 from iicdii/fix/11774
...
Fix plugin config per environment doesn't apply
2021-12-14 13:52:18 +01:00
Alexandre BODIN
6f0458590f
Merge pull request #11769 from iicdii/fix/11768
...
Fix unable to download original image in uploader
2021-12-14 13:47:39 +01:00
MatsubaraDaisuke
52a3ba90ff
Merge branch 'master' into test/pxToRem
2021-12-14 21:07:08 +09:00
harimkims
e99079af24
remove unnecessary line
2021-12-14 19:46:34 +09:00
harimkims
ef063a1982
remove console log
...
Signed-off-by: harimkims <harimkims@gmail.com>
2021-12-14 18:41:49 +09:00
vincentbpro
a5ac20dda0
fix: avoid divided by zero issue
2021-12-14 10:41:47 +01:00
Alexandre BODIN
da73164fbc
Merge pull request #11734 from iicdii/translation-ko
...
Update ko translation, add missing key
2021-12-14 10:14:09 +01:00
Yuku Takahashi
13435d25d0
Remove unnecessary comment
...
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
2021-12-14 08:42:35 +09:00
Alexandre BODIN
6477087d68
Merge pull request #11794 from jakobsjoqvist/update-contributing
...
Replace npm with yarn in contributing
2021-12-13 14:33:03 +01:00
Alexandre BODIN
11d4ed8527
Merge pull request #11724 from strapi/chore/fingerprint-fix
...
Added fingerprint prefix in order to match the one on strapi website
2021-12-13 14:32:14 +01:00
Alexandre BODIN
8a8a51b620
Merge pull request #11819 from jsprds/jsprds-dutch-translation-fix
...
Update nl.json
2021-12-13 14:22:28 +01:00
MatsubaraDaisuke
b2d41cf86c
Merge branch 'master' into test/pxToRem
2021-12-13 21:46:01 +09:00
ivanThePleasant
c05a2ba7c9
Merge branch 'master' into chore/fingerprint-fix
2021-12-13 12:24:43 +00:00
Alexandre BODIN
b372f8c185
Merge pull request #11808 from jakobsjoqvist/fix/skip-regex-validation-empty-string
...
Fix regex validation for empty string in non-required fields
2021-12-13 11:52:36 +01:00
ivanThePleasant
22c82f48f1
Reworked fingerprint prefix
2021-12-13 12:50:21 +02:00
Jakob Sjöqvist
aa13ed3255
Improve descriptions for string regexp validator
2021-12-13 10:20:12 +01:00
DMehaffy
a5afca42ff
Merge branch 'master' into jsprds-dutch-translation-fix
2021-12-12 19:10:52 -07:00
Jakob Sjöqvist
30041e3a16
Add backend tests for regexp validator
2021-12-12 12:46:06 +01:00
Jakob Sjöqvist
af5cf692dc
Make required check less wordy
2021-12-12 12:46:05 +01:00
Jakob Sjöqvist
0e0c74e514
Ignore empty strings in regex validation on server side if field not required
2021-12-12 12:46:05 +01:00
Jakob Sjöqvist
a837c960d1
Ignore regex validation for empty string when field is not required
2021-12-12 12:46:05 +01:00
Yuku Takahashi
bcb2745733
Apply suggestions from code review
2021-12-11 00:27:32 +09:00
matsubara
77fc12b75c
add test of pxToRem
2021-12-10 23:04:59 +09:00
MatsubaraDaisuke
0e033becb4
Merge branch 'master' into matsubara-japanese-translation-fix
2021-12-10 21:49:14 +09:00
Alexandre BODIN
f80b89fe69
Merge pull request #11864 from strapi/fix/enum
...
Switch Enum from native type to string or text
2021-12-10 13:23:06 +01:00
DMehaffy
e898012f1c
Merge branch 'master' into update-contributing
2021-12-09 21:34:18 -07:00
DMehaffy
5599e69df6
Merge branch 'master' into jsprds-dutch-translation-fix
2021-12-09 20:57:38 -07:00
derrickmehaffy
3abba613ce
forgot the diff
2021-12-09 15:02:40 -07:00
harimkims
5414bb8793
fix internal plugin's enabled flag ignore user plugin's enabled
...
- make `get-user-plugins-config` function as independent function
- when you load enabled plugins, use `get-user-plugins-config` function so that it recognizes user's plugin config per environment
Signed-off-by: harimkims <harimkims@gmail.com>
2021-12-10 04:41:07 +09:00
derrickmehaffy
e16bf9b259
Switch Enum from native type to string or text
...
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
2021-12-09 12:31:52 -07:00
harimkims
6bb5403ccb
simplify join
...
Signed-off-by: harimkims <harimkims@gmail.com>
2021-12-09 21:55:41 +09:00
Alexandre BODIN
073f279e91
Merge pull request #11791 from Webbist-dev/fix/create-component-visibility-production
...
Set visibility on create component button when in production
2021-12-09 13:53:23 +01:00
harimkims
bf62193912
use lodash/fp merge instead lodash
...
Signed-off-by: harimkims <harimkims@gmail.com>
2021-12-09 20:53:36 +09:00
harimkims
b56bd71be9
apply feedback
...
Signed-off-by: harimkims <harimkims@gmail.com>
2021-12-09 20:48:42 +09:00
Kim, Harim
de3ee7e98a
Merge branch 'master' into fix/11774
2021-12-09 20:16:41 +09:00
Alexandre BODIN
398ecd9071
Merge pull request #11752 from strapi/v4/product-copy-text-changes-v1
...
Product copy text changes v1
2021-12-09 10:13:34 +01:00
Alexandre BODIN
b1ba3c6b1c
Merge pull request #11780 from strapi/fix/save-up-settings
...
Fix saving up settings
2021-12-09 09:56:33 +01:00
Alexandre BODIN
2c49c531ba
Merge pull request #11749 from strapi/fix/cli-ct-attribute-generator
...
Fix the attribute generation for the CT generator
2021-12-09 09:28:52 +01:00
Dieter Stinglhamber
cf5af8b189
update gitignore
2021-12-09 08:54:39 +01:00
Yuku Takahashi
b019507e58
Skip if dependency doesn't export package.json
2021-12-08 23:10:09 +09:00
vincentbpro
7183aa443c
style: small text changes
2021-12-07 17:36:57 +01:00
MatsubaraDaisuke
b3ce259c47
Merge branch 'master' into matsubara-japanese-translation-fix
2021-12-07 21:33:50 +09:00
derrickmehaffy
d32c487176
one more fix
2021-12-07 09:27:59 +01:00
DMehaffy
20deb8d3ec
Fix typo in in AWS-S3 Provider ReadMe
...
I forgot to end my code block 🙈
2021-12-07 09:27:59 +01:00
matsubara
74b96a56dc
Update ja.json
2021-12-07 00:51:29 +09:00
Jasper De Smet
5c2431916f
Update nl.json
...
Fix: translation (dutch "dt-rule" mistake)
2021-12-06 10:36:50 +01:00
