yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-03 22:39:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,846 Commits 109 Branches 487 Tags
Commit Graph

1896 Commits

Author SHA1 Message Date
GitStart
1642c18734
Merge branch 'main' into STRAP-54 2022-09-15 07:31:52 +01:00
Simone Taeggi
8753fae8ff Merge branch 'main' into features/api-token-v2 2022-09-14 14:47:38 +02:00
Marc-Roig
2f0380fb16 local provider transform file size to kb 2022-09-13 17:42:50 +02:00
Marc-Roig
36e237f394 leave verify size function inside local provider 2022-09-13 16:14:34 +02:00
Pierre Noël
72eec1fb7c Merge branch 'main' into fix/upload-new-file-to-entity 2022-09-13 16:00:05 +02:00
Marc-Roig
91cb0fba9b Merge remote-tracking branch 'origin/feature/provider-size-limit' into feature/provider-size-limit 2022-09-13 11:34:39 +02:00
Marc-Roig
32e321fc42 account for empty providerOptions 2022-09-13 11:34:28 +02:00
Marc
11a804a39e
Merge branch 'main' into feature/provider-size-limit 2022-09-13 11:18:04 +02:00
Marc-Roig
df28f7026e checkFileSize in provider upload 2022-09-13 10:21:30 +02:00
Konstantin Münster
1ed929d8c0
update sharp in upload package 2022-09-10 15:02:11 +02:00
Simone Taeggi
e1a0ae803e Merge branch 'main' into features/api-token-v2 2022-09-08 22:16:55 +02:00
David Lüder
14821c6ac5 Fix intlLabel for $ne-Filter for correct translations 2022-09-08 15:00:08 +00:00
GitStart
130b24d090
Merge branch 'main' into STRAP-63 2022-09-08 19:12:35 +05:00
gitstart
1f961f1883 ML: Empty state is shown after deleting all assets from a page 2022-09-08 12:31:51 +00:00
Pierre Noël
79e0671e61
Merge branch 'main' into fix/upload-new-file-to-entity 2022-09-08 11:49:27 +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
Pierre Noël
f681c064c4 Fix relation not correctly set when uploadinga new file to an entity 2022-09-05 16:18:35 +02:00
ivanThePleasant
b5c98ae0cd Refactor event calls to follow old format, encapsulate hashing in the sender, refactor the format of event payload to better correspond to the new api 2022-09-02 14:43:51 +03:00
ivanThePleasant
cbfde4a11c Merge branch 'main' into chore/user-level-data 2022-09-02 12:22:12 +03:00
Simone Taeggi
078c4fb96c merge main in features/api-token-v2 2022-09-01 09:50:19 +02:00
GitStart
d78c61e1ac
Merge branch 'main' into STRAP-54 2022-09-01 07:16:15 +01:00
Gustav Hansen
7f0ddf0654
Merge pull request #14221 from strapi/chore/jest-29 
chore: Update jest packages to v29
 2022-08-31 14:40:00 +02:00
GitStart
f138bc381a
Merge branch 'main' into STRAP-54 2022-08-31 16:31:24 +05:45
gitstart
6b94965574 ID in schema have type string 2022-08-31 10:37:08 +00:00
Convly
d4688c716a Fix instanciate => instantiate 2022-08-31 11:46:43 +02:00
David Fariña
5a7e8e9807 Update upload plugin catalan translation 2022-08-30 16:49:56 +02:00
Gustav Hansen
269c9cb988 chore: Resolve jest@26 TODO 2022-08-30 15:44:12 +02:00
Gustav Hansen
eaa938eaeb chore: Update frontend snapshot tests 2022-08-30 15:44:12 +02:00
Julie Plantey
9496693a31
Merge pull request #14195 from WalkingPizza/fix/settings-button-sizes 
Make all settings header primary actions small
 2022-08-29 16:51:46 +02:00
Gustav Hansen
c2419b5a0d chore: Update snapshot tests 2022-08-29 12:14:20 +02:00
Kevin Antonio Rateni Iatauro
df30b7a6c1
Merge branch 'main' into fix/settings-button-sizes 2022-08-29 09:51:12 +02:00
WalkingPizza
a25d813b6c Update snapshots 2022-08-29 09:50:46 +02:00
ivanThePleasant
a1ea7439ea Merge branch 'main' into chore/user-level-data 2022-08-25 15:21:39 +03:00
Alexandre Bodin
4c6e67c493 v4.3.6 2022-08-24 15:53:23 +02:00
WalkingPizza
a3c0b3b10b Make all header primary actions small 2022-08-24 14:49:01 +02:00
Alexandre Bodin
a52b053551 v4.3.5 2022-08-24 14:10:18 +02:00
Julie Plantey
e309130ae6
Merge pull request #14115 from Hertak/master 
Update es.json
 2022-08-24 10:34:32 +02:00
Gustav Hansen
4eb360c720
Merge pull request #14172 from strapi/dependabot/npm_and_yarn/react-intl-5.25.1 
Bump react-intl from 5.20.2 to 5.25.1
 2022-08-23 17:09:08 +02:00
Gustav Hansen
58a696436f Breadcrumbs: Update snapshot tests & fix prop-types 2022-08-23 14:04:06 +02:00
Gustav Hansen
6da2461d3c BulkMoveButton: Fix prop-types 2022-08-23 13:55:54 +02:00
Gustav Hansen
1a91b52e7c ML: Fix header prop-types 2022-08-23 13:50:13 +02:00
Gustav Hansen
a228ad66bc AssetDialog: Fix prop-types 2022-08-23 13:39:32 +02:00
dependabot[bot]
ac52015273
Bump react-intl from 5.20.2 to 5.25.1 
Bumps [react-intl](https://github.com/formatjs/formatjs) from 5.20.2 to 5.25.1.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/react-intl@5.20.2...react-intl@5.25.1)

---
updated-dependencies:
- dependency-name: react-intl
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-23 09:10:41 +00:00
Julie Plantey
73b12aa94d upgrading to v2.29.2 because 2.29.1 introduced a breaking change on intervalToDuration 2022-08-18 18:31:27 +02:00
dependabot[bot]
01aaee8d36 Bump date-fns from 2.28.0 to 2.29.1 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.28.0 to 2.29.1.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/main/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.28.0...v2.29.1)

---
updated-dependencies:
- dependency-name: date-fns
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-17 13:06:42 +02:00
Marc
21d06ce7d0
Merge pull request #13996 from strapi/fix/upload-image-without-extension 
Fix: upload media image with non standard urls
 2022-08-17 09:29:29 +02:00
Hertak
863511fe9f
Update es.json 2022-08-16 17:01:41 -03:00
ivanThePleasant
de26abb7ff Merge branch 'master' into chore/user-level-data 2022-08-16 12:53:49 +03:00