yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-10 09:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 115 Branches 488 Tags
Commit Graph

5169 Commits

Author SHA1 Message Date
David Lüder
4ea9d481a9
Merge branch 'main' into filter-translation-neq-removal 2022-09-13 02:29:59 +02:00
Simone Taeggi
4907cbb36b update test 2022-09-12 23:32:27 +02:00
Simone Taeggi
f3ef246013 fix select all bug 2022-09-12 22:57:04 +02:00
Simone Taeggi
961a3cb202 merge main branch 2022-09-12 22:56:52 +02:00
Mark Kaylor
c4197573cd Lint fix 2022-09-12 14:53:13 -04:00
Julie Plantey
92c9feb79c updated snapshots 2022-09-12 17:19:59 +02:00
Julie Plantey
d6f619900d temp fix react select position 2022-09-12 16:54:09 +02:00
Julie Plantey
8d9bf0e447 select 100% depending on grid size 2022-09-12 15:58:07 +02:00
Julie Plantey
2f7852c6eb fix padding issues 2022-09-12 15:28:43 +02:00
Gustav Hansen
db94e2a877 EditViewDataManagerProvider: Update cleanData test 2022-09-12 14:55:46 +02:00
Gustav Hansen
b54fd46eae EditViewDataManagerProvider: Only send connect/ disconnect for relations 2022-09-12 14:55:46 +02:00
Julie Plantey
fa2590e47c wrap & placeholder ellipsis 2022-09-12 14:55:25 +02:00
Gustav Hansen
9967b09d76 EditViewDataManagerProvider: Keep initialData and modifiedData in sync 
Co-authored-by: Julie Plantey <ronronscelestes@users.noreply.github.com>
 2022-09-12 14:55:15 +02:00
Gustav Hansen
3809e2d1a6 EditViewDataManagerProvider: Progressively enhance relations state 2022-09-12 14:48:40 +02:00
Gustav Hansen
0bb5a2d22d
Merge pull request #14383 from strapi/feature/relations-main-view-locale 
RelationInputWrapper: Pass down the current locale as query parameter
 2022-09-12 13:32:24 +02:00
Gustav Hansen
ea81070d8a RelationInputWrapper: Pass down the current locale as query parameter 2022-09-12 12:17:03 +02:00
Julie Plantey
3b53153723
Merge pull request #14290 from WalkingPizza/fix/13648 
Trim admin's first name when validating
 2022-09-12 10:31:32 +02:00
Gustav Hansen
29e2e43132 RelationInputWrapper: Do not attempt fetching relations, if count == 0 2022-09-12 09:41:37 +02:00
Gustav Hansen
0bfb5aa5ba RelationInput: Remove unnecessary optional chaining operators 2022-09-12 09:22:04 +02:00
Gustav Hansen
d489de5692 RelationInputWrapper: Fix normalization of relations, if results are empty 2022-09-12 09:17:50 +02:00
Julie Plantey
067b1a2987 if no stored theme, store OS theme in local storage 2022-09-09 17:43:05 +02:00
Simone Taeggi
cae16f7f25 Merge branch 'main' into features/api-token-v2 2022-09-09 16:08:28 +02:00
Julie Plantey
760b396b7d
Merge pull request #14292 from Zharkan/fix-fr-translations 
fix: some french translations are not correct
 2022-09-09 15:20:49 +02:00
Simone Taeggi
abde7cab04 Merge branch 'features/api-token-v2' into api-token-v2/sync-token-type-and-permissions 2022-09-09 12:44:35 +02:00
Simone Taeggi
4101c523bb change position to permissions dependency 2022-09-09 12:38:34 +02:00
Simone Taeggi
b4e083fdeb add dependencies 2022-09-09 00:54:00 +02:00
Simone Taeggi
2870ba20f9 Merge branch 'features/api-token-v2' into api-token-v2/regenerate-permission 2022-09-09 00:53:32 +02:00
Simone Taeggi
8e97e90c3d add regenerate command even on read 2022-09-09 00:09:16 +02:00
Simone Taeggi
f20dd5cce0 Revert "add regenerate command even on read" 
This reverts commit fc53ef1a7b72c02c45152ff47b32a989a616b721.
 2022-09-08 23:55:12 +02:00
Simone Taeggi
1a289ca1ff Revert "merge main" 
This reverts commit 5dc28ed5e5ead9b83b8bb30f96efc6eb6f1d3e3f.
 2022-09-08 23:49:07 +02:00
Simone Taeggi
5dc28ed5e5 merge main 2022-09-08 23:40:39 +02:00
Simone Taeggi
a0057b5b0b Merge branch 'features/api-token-v2' into api-token-v2/sync-token-type-and-permissions 2022-09-08 22:21:24 +02:00
Simone Taeggi
e1a0ae803e Merge branch 'main' into features/api-token-v2 2022-09-08 22:16:55 +02:00
Simone Taeggi
3d5eaebe12 refactor using setField 2022-09-08 22:09:15 +02:00
Simone Taeggi
cb69ec34a4 Merge branch 'features/api-token-v2' into api-token-v2/sync-token-type-and-permissions 2022-09-08 17:06:16 +02:00
David Lüder
f0769a5916 Remove duplicate $ne/$neq-Translation in zh-Hans 2022-09-08 15:00:49 +00:00
Simone Taeggi
fc53ef1a7b add regenerate command even on read 2022-09-08 15:44:43 +02:00
Pierre Noël
3f72ff3a73 Merge branch 'main' into feature/relations-main-view 2022-09-08 15:41:31 +02:00
Simone Taeggi
a0d9779c5e replace Number with parseInt 2022-09-08 15:31:17 +02:00
Simone Taeggi
eefc744724 fix delete all permissions on create 2022-09-08 15:21:06 +02:00
Alexandre BODIN
59b83c5953
Merge pull request #14320 from strapi/chore/eslint 
chore/eslint
 2022-09-08 14:45:12 +02:00
Gustav Hansen
928dfd660c
Merge pull request #14355 from strapi/feature/relations-main-view-mainfield-fallback 
RelationInput: Render id as fallback, if no mainField was set
 2022-09-08 12:06:28 +02:00
Simone Taeggi
85219da3e6 fix lifespan validation keyboard navigation 2022-09-08 12:05:22 +02:00
Gustav Hansen
9e4433f881 useRelation/ normalizeRelations: Handle 204 response code properly 2022-09-08 11:57:51 +02:00
Simone Taeggi
d48f5919c3 fix the api-token routes policy 2022-09-08 11:39:09 +02:00
Simone Taeggi
3a81a1ddf3 fix bug related to change type from custom 2022-09-08 11:35:35 +02:00
Gustav Hansen
16efdef61c
Merge pull request #14352 from strapi/relations/move-connect-disconnect 
[Relations] Move connect/disconnect
 2022-09-08 11:33:07 +02:00
Gustav Hansen
f8bff59f86 RelationInput: Render id as fallback, if no mainField was set 2022-09-08 11:28:36 +02:00
Julie Plantey
1513d0e9c1 fire search on open search 2022-09-08 11:06:08 +02:00
Julie Plantey
5322d070b9 moved creation of connect/disconnect 2022-09-08 11:03:59 +02:00