yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-23 00:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,133 Commits 111 Branches 484 Tags
Commit Graph

2499 Commits

Author SHA1 Message Date
Simone Taeggi
17b6cf240f update snapshots 2022-09-21 14:54:17 +02:00
Alexandre Bodin
5681c1e38f Merge branch 'main' into features/custom-fields 2022-09-21 14:27:56 +02:00
Alexandre Bodin
29602a66a9 Merge branch 'features/api-token-v2' into releases/4.4.0 2022-09-21 14:25:53 +02:00
Alexandre Bodin
8ebf58d9ed v4.3.9 2022-09-21 14:17:36 +02:00
Julie Plantey
3644f4c24d update unit test snapshot 2022-09-21 14:05:09 +02:00
markkaylor
8bfe6aabd1
Merge pull request #14341 from dmeijboom/feature/openapi-filters 
Add free-form filters to the query parameters
 2022-09-21 10:12:23 +02:00
ivanThePleasant
b51b0f4616 Merge branch 'main' into chore/user-level-data 2022-09-21 10:24:18 +03:00
chris-turner-datacom
fb301da911
Merge branch 'strapi:main' into add-te-reo-maori-locale 2022-09-21 17:33:15 +12:00
Julie Plantey
c0dc795586 updated DS version and snapshots 2022-09-20 17:18:24 +02:00
Convly
7598190b30 Merge branch 'main' of github.com:strapi/strapi into features/api-token-v2 2022-09-20 15:29:36 +02:00
Dillen Meijboom
095c8822c1
Add free-form filters to the query parameters 2022-09-20 11:48:59 +02:00
Julie Plantey
823b738ca7
Merge pull request #14445 from strapi/enh/iso-locales-en-PA 
[Enh] en-PA locale
 2022-09-20 10:45:11 +02:00
GitStart
c700c7f9a8
Merge branch 'main' into STRAP-54 2022-09-20 08:24:32 +01:00
Julie Plantey
c3f17f897f added en-PA locale 2022-09-19 16:15:33 +02:00
Adedoyin Akande
44c0d004bf update locales to match snap 2022-09-16 20:17:25 +01:00
GitStart
1642c18734
Merge branch 'main' into STRAP-54 2022-09-15 07:31:52 +01:00
Mark Kaylor
c84e975a94 Add missing dependency causing test to fail 2022-09-13 15:57:56 -04:00
Mark Kaylor
c2062e4096 Update node version 2022-09-13 14:08:59 -04:00
Mark Kaylor
062f92cc99 Merge branch 'features/custom-fields' of github.com:strapi/strapi into custom-fields/rm-plugin 2022-09-13 10:56:43 -04:00
Mark Kaylor
21fd40e243 Merge branch 'main' of github.com:strapi/strapi into features/custom-fields 2022-09-13 10:30:19 -04:00
Mark Kaylor
ed2b0588c6 Fix name and version 2022-09-13 08:47:00 -04:00
Mark Kaylor
a67ff09585 Merge branch 'features/custom-fields' of github.com:strapi/strapi into custom-fields/rm-plugin 2022-09-13 08:20:49 -04:00
Mark Kaylor
dadd495077 Update snapshot 2022-09-12 14:53:37 -04:00
Mark Kaylor
c4197573cd Lint fix 2022-09-12 14:53:13 -04:00
Mark Kaylor
d686d4975b Use standard CSS comments to avoid lint error 2022-09-12 14:43:39 -04:00
Mark Kaylor
8f0e20d226 Rename plugin custom-fields => color-picker 2022-09-12 14:16:35 -04:00
Mark Kaylor
39c04410c1 Convert customField type before sending to server 2022-09-12 10:36:13 -04:00
Adedoyin Akande
277d42c010
Merge branch 'main' into add-locales 2022-09-12 12:28:09 +01:00
chris-turner-datacom
b9dd8bcbcc
Add Te Reo Māori locale 2022-09-10 15:10:23 +12:00
Simone Taeggi
e1a0ae803e Merge branch 'main' into features/api-token-v2 2022-09-08 22:16:55 +02:00
Pierre Noël
3f72ff3a73 Merge branch 'main' into feature/relations-main-view 2022-09-08 15:41:31 +02:00
Alexandre BODIN
59b83c5953
Merge pull request #14320 from strapi/chore/eslint 
chore/eslint
 2022-09-08 14:45:12 +02:00
Alexandre Bodin
6654ad3528 Add node 18 2022-09-08 08:44:27 +02:00
Alexandre Bodin
c44f21d5ba v4.3.8 2022-09-07 16:47:41 +02:00
Alexandre Bodin
73f523b983 v4.3.7 2022-09-07 14:24:30 +02:00
Rémi de Juvigny
b381606c1a WIP remove mycustomfields plugin 2022-09-07 10:56:25 +02:00
Pierre Noël
1850264b3c
Merge pull request #14262 from strapi/relations-main-view/get-relations 
Add "get relations" route and remove "preview relations"
 2022-09-06 16:56:49 +02:00
Gustav Hansen
931f6cdc8f Merge branch 'main' into feature/relations-main-view 2022-09-06 14:39:03 +02:00
GitStart
d3c8267cf2
Merge branch 'main' into STRAP-54 2022-09-06 12:30:37 +01:00
Pierre Noël
3ff32e91eb use entityService + redo permissions 2022-09-06 12:17:54 +02:00
Adedoyin Akande
e803830a88
update Antigua 2022-09-06 10:51:18 +01:00
Adedoyin Akande
73b97a1d26
update Antigua 2022-09-06 10:50:31 +01:00
Adedoyin Akande
cffa83acf6
Merge branch 'main' into add-locales 2022-09-06 10:49:25 +01:00
ivanThePleasant
f92b4aebe6 Merge branch 'main' into chore/user-level-data 2022-09-06 09:06:50 +03:00
gitstart
9175297519 ID in schema have type string 2022-09-06 05:35:56 +00:00
Simone Taeggi
8c1e0ea2fe Merge branch 'main' into features/api-token-v2 2022-09-05 17:01:58 +02:00
Alexandre Bodin
e57f02d2d9 Fix eslint in plugins folder 2022-09-05 15:18:24 +02:00
Alexandre BODIN
e8cdc26240
Merge pull request #14275 from dmeijboom/hotfix/users-permissions-openapi-spec 
Fix several issues in the users-permissions OpenAPI specification
 2022-09-05 14:53:52 +02:00
Adedoyin Akande
5374874a03
Merge branch 'main' into add-locales 2022-09-04 07:38:42 +01:00
Adedoyin Akande
93cddd8f9f update locales 
- with specific code language
- ensure to follow consistent name sorting
 2022-09-04 07:18:23 +01:00