yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-03 19:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,342 Commits 122 Branches 507 Tags
Commit Graph

25342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Convly
bb7d566d42 Merge branch 'main' of github.com:strapi/strapi into features/deits 2022-11-09 15:15:28 +01:00
Ben Irvin
ff8290f4bf fix import 2022-11-09 14:29:18 +01:00
Gustav Hansen
210cdb4c0c
Merge pull request #14817 from strapi/chore/home-page-corner-ornament 
HomePage: Replace corner ornament with a small SVG
 2022-11-09 14:10:59 +01:00
Ben Irvin
9d76323212 add HHMMSS to default filename 2022-11-09 12:39:01 +01:00
Gustav Hansen
b5e42b9970 HomePage: Replace corner ornament with a small SVG 2022-11-09 12:25:47 +01:00
Ben Irvin
5128e333c8 fix 2022-11-09 12:25:02 +01:00
Ben Irvin
824d0339a2
Merge branch 'features/deits' into deits/ts-linting 2022-11-09 11:07:25 +01:00
Ben Irvin
cdb0e0f456 update 2022-11-09 11:02:35 +01:00
Gustav Hansen
70281fae37
Merge pull request #14816 from strapi/chore/brand-assets-2 
Chore: Cleanup brand assets
 2022-11-09 10:52:06 +01:00
Ben Irvin
e0c969a0dd use @typescript-eslint/parser for typescript 2022-11-09 09:56:05 +01:00
Alexandre Bodin
3b75fbe9d6 Fix contrib doc 2022-11-09 09:51:23 +01:00
Gustav Hansen
a3b0e905a8 Chore: Update snapshot tests 2022-11-09 09:36:21 +01:00
Gustav Hansen
b323d03b3c Chore: Cleanup brand assets 2022-11-09 09:08:25 +01:00
Cooper Floyd
8b17039e04
Merge branch 'main' into fix/upload-alt-caption-filename 2022-11-08 10:26:20 -06:00
Alexandre Bodin
511a024b1e Update contributor github workflow 2022-11-08 17:17:55 +01:00
Alexandre BODIN
fe489be1ed
Merge pull request #14808 from strapi/chore/contributing 2022-11-08 16:51:35 +01:00
Ben Irvin
3b345aa4f8
Merge pull request #14803 from strapi/deits/fix-option-encryption-key 
[DEITS] Make encryption key type optional
 2022-11-08 16:51:26 +01:00
Ben Irvin
528f559b19 fix filename 2022-11-08 16:23:41 +01:00
Ben Irvin
91d0961ac2 add counter to file destination provider 2022-11-08 16:04:43 +01:00
Ben Irvin
01621ab320 add counts to local strapi source provider 2022-11-08 15:47:51 +01:00
Ben Irvin
dfbf05248b throw errors instead of suppressing 2022-11-08 15:23:14 +01:00
Alexandre BODIN
2e75537595
Merge pull request #14733 from strapi/chore/rename-e2e-to-api 2022-11-08 14:31:17 +01:00
Ben Irvin
8b4d475f00 add provider results object and typings 2022-11-08 14:26:48 +01:00
oiorain
93535bc2c8 Link to documentation instead 2022-11-08 14:11:40 +01:00
Gustav Hansen
8f73e1182e
Merge pull request #14810 from strapi/chore/cleanup-logo-assets 
Chore: Cleanup brand assets
 2022-11-08 13:30:22 +01:00
Gustav Hansen
5064a50511
Merge pull request #14809 from strapi/chore/update-logo 
Update logo
 2022-11-08 13:30:06 +01:00
Josh
1daf8dd67a
Merge pull request #14801 from strapi/fix/relations/scroll-to-end 2022-11-08 12:28:07 +00:00
Alexandre Bodin
d156773835 Merge branch 'main' into chore/contributing 2022-11-08 12:04:11 +01:00
Alexandre Bodin
8f17bcfa7d Update docusaurus url 2022-11-08 12:03:45 +01:00
Ben Irvin
6e4e621e9f add file check 2022-11-08 12:03:38 +01:00
Alexandre Bodin
4c40306302 Update docusaurus config 2022-11-08 12:01:55 +01:00
Aurélien Georget
dff7e91b70
Fix conflicts 2022-11-08 11:16:48 +01:00
Aurélien Georget
dbc253c7aa
Compress and update menu logo 2022-11-08 11:15:42 +01:00
Gustav Hansen
612f85a40f Chore: Recompress png files 2022-11-08 11:14:54 +01:00
Gustav Hansen
484e3c0090 Chore: Delete legacy logo files 2022-11-08 11:14:42 +01:00
Ben Irvin
9cfed3598c add key check to bootstrap 2022-11-08 11:11:50 +01:00
Gustav Hansen
766db8ed9c Chore: Improve strapi logo compression 2022-11-08 11:04:18 +01:00
Aurélien Georget
c90478fb75
Update logo 2022-11-08 10:54:39 +01:00
Alexandre Bodin
19bb79b2c0 Add contributing guide and code of conduct in the contrbutor doc 2022-11-08 10:51:53 +01:00
Alexandre Bodin
ae6ff150e2 Init 2022-11-08 10:48:23 +01:00
dependabot[bot]
3f82471793
chore(deps): bump loader-utils from 1.4.0 to 1.4.1 
Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.1/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v1.4.0...v1.4.1)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-08 09:44:41 +00:00
Alexandre BODIN
ea360a8266
Merge pull request #14664 from strapi/feature/market-sort-filters 2022-11-08 10:43:15 +01:00
Josh
1d10f5ee67 feat: scroll to bottom and top of list depending on how relations changed 
does not scroll when the object "just changes"
 2022-11-08 09:39:07 +00:00
Alexandre Bodin
15696c21d6 Update CONTRIBUTING.md 2022-11-08 10:11:56 +01:00
Josh
7619694451 fix: bug with hook pre-fetching because it's listening to browser state 2022-11-08 08:56:38 +00:00
Convly
9e62028699 Add decrypt to the local file source provider & fix duplex issue 2022-11-08 09:41:53 +01:00
Mark Kaylor
b84fd921a6 Merge branch 'main' of github.com:strapi/strapi into feature/market-sort-filters 2022-11-08 09:24:35 +01:00
Alexandre BODIN
c07ad6aa56
Merge pull request #14771 from boahc077/main 2022-11-07 18:54:53 +01:00
Ben Irvin
16e68f9e76 make encryption key optional 2022-11-07 18:48:33 +01:00
Alexandre Bodin
6ae9c6f5dd Cleanup logs 2022-11-07 18:07:24 +01:00