yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-13 03:07:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,325 Commits 116 Branches 488 Tags
Commit Graph

11019 Commits

Author SHA1 Message Date
Josh
8e705cf7c6 chore: remove react-select usage 
chore: update snapshot

fix: only try to add a relation with an id

chore: tweaks

chore: update snapshots
 2023-06-26 15:56:49 +01:00
Jamie Howard
1e4ec9a224 fix(Settings/Webhooks): correctly display webhook name error 2023-06-26 15:49:43 +01:00
Ben Irvin
c8e128d11c Merge branch 'main' into chore/upgrade-jest-to-29.5 2023-06-26 16:31:04 +02:00
Ben Irvin
23e86fd063 fix some tests 2023-06-26 16:26:39 +02:00
Josh
c593a2735b
Merge pull request #17102 from nitinmadelyn/profile-improvement 2023-06-26 15:19:39 +01:00
Ben Irvin
33a0033f65
Merge pull request #17100 from strapi/fix/lint-webhoot-events 2023-06-26 16:12:19 +02:00
Alexandre Bodin
bae3d7363a Fix small bugs breaking the tests 2023-06-26 15:57:46 +02:00
Josh
c43d25328b
Merge pull request #16802 from damuso/fix/media-library-multiple-selection 2023-06-26 13:55:17 +01:00
Nitin
2974996702 Prevent unnecessary api calls on profile save 2023-06-26 17:59:20 +05:30
Ben Irvin
2586daeecc eof eol 2023-06-26 14:20:52 +02:00
Ben Irvin
72fb317529 fix linting error 2023-06-26 12:44:08 +02:00
Ben Irvin
8627f96d89 fix after merge 2023-06-26 12:41:10 +02:00
Damián Paranič
5d30450570 added tests for new methods in useSelectionState hook 2023-06-26 12:37:52 +02:00
Damián Paranič
a757f0ffc7 added code comments 2023-06-26 12:37:27 +02:00
Ben Irvin
68e7bc8b21
Merge branch 'main' into chore/data-transfer-dev-docs 2023-06-26 12:32:02 +02:00
Ben Irvin
9f61258e74 add remote provider docs 2023-06-26 12:23:35 +02:00
Marc-Roig
9ad390e653
test: update lastUsedAt so field is updated only once an hour 2023-06-26 11:40:18 +02:00
Marc-Roig
d3323219c3
lastUsed update resolution to 1 hour 2023-06-26 11:17:51 +02:00
Marc-Roig
d535798aaa
update data transfer lastUsed once a day 2023-06-26 11:17:14 +02:00
Marc-Roig
a8fee831c7
update last used at once a day 2023-06-26 11:11:55 +02:00
Ben Irvin
fba7d1d77d local strapi docs 2023-06-26 11:10:09 +02:00
Nitin
a57671b3a9
Merge branch 'main' into ui-improvement 2023-06-26 14:20:35 +05:30
Danish Joseph
3a88a086b2
Merge branch 'main' into fix/image-preview-after-replace 2023-06-26 14:15:40 +05:30
Alexandre Bodin
73810431fe Merge branch 'main' into chore/ts-core 2023-06-26 10:44:09 +02:00
Damián Paranič
0e26a36dc4
Merge branch 'strapi:main' into fix/media-library-multiple-selection 2023-06-26 10:37:02 +02:00
Nitin
215302ad24 fix lint issue 2023-06-26 13:35:29 +05:30
Nitin
ec8cf8e442
Merge branch 'main' into ui-improvement 2023-06-26 13:30:06 +05:30
Ben Irvin
17f3d909d9 add file providers docs 2023-06-26 09:56:49 +02:00
Alexandre Bodin
63a0ff708e Fix relative imports 2023-06-26 09:39:58 +02:00
danishjoseph
a1c2ba6c57 fix: image preview after replacing 2023-06-25 11:48:18 +02:00
Alexandre Bodin
32a8055f21 Merge remote-tracking branch 'origin/main' into chore/ts-core 2023-06-23 20:59:58 +02:00
Alexandre Bodin
131988a98d Update after PR review 2023-06-23 20:58:27 +02:00
Gustav Hansen
c8d6478ec5
Merge pull request #17079 from strapi/fix/rendering-loops 
Fix: Rendering loops for audit-logs and SSO settings pages
 2023-06-23 15:44:06 +02:00
Gustav Hansen
c2b630c4ee
Merge pull request #17078 from strapi/fix/roles-rendering-loop 
Fix: Fix infinite rendering loop of role edit page
 2023-06-23 15:34:26 +02:00
Gustav Hansen
ee66e7cc95 Fix: Fix SSO setting page permissions 2023-06-23 15:21:16 +02:00
Gustav Hansen
dfc130f2f1 Fix: Fix audit-logs rendering loop 2023-06-23 15:20:38 +02:00
Gustav Hansen
04314f11f8 Fix: Fix infinite rendering loop of role edit page 2023-06-23 15:06:39 +02:00
Christian Capeans
0e83bc28d9 Optimise pull transfer for entities, configurations and links 2023-06-23 13:57:54 +02:00
Mark Kaylor
1cceb67f65 Fix padding 2023-06-23 11:45:03 +02:00
Mark Kaylor
3f4bfdbdd1 Fix bulk publish removed 2023-06-23 09:52:58 +02:00
Nitin Muchhadiya
2d1179aaf6 update user.name to commit 2023-06-23 10:25:40 +05:30
Nitin Muchhadiya
c9b789538d remove user.name to commit 2023-06-23 10:25:40 +05:30
nitinmadelyn
3c6d45a223 add email to commit 2023-06-23 10:25:40 +05:30
Nitin
2ee4129d95 add back icon on popup while adding new field under Content Type Builder 2023-06-23 10:24:56 +05:30
Josh
9a537e811b chore: merge fixes 
chore: fix lint
 2023-06-22 09:18:57 +01:00
Marc
674dc96b89 refactor: mark uid as a prohibited field & separate auto-clone route (#16957) 
Co-authored-by: Josh <37798644+joshuaellis@users.noreply.github.com>
 2023-06-22 08:12:20 +01:00
Josh
f72a62be05 fix: error message improvements (#16949) 2023-06-22 08:12:12 +01:00
Josh
38cafa5385 chore: fix weird merge conflict 2023-06-22 08:12:12 +01:00
Marc-Roig
ec434498d1 fix: excludeNotCreatableFields 2023-06-22 08:12:11 +01:00
Josh
b62df89641 fix: if we have an origin it will be type string 2023-06-22 08:12:11 +01:00