yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-04 06:49:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,700 Commits 109 Branches 487 Tags
Commit Graph

28700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DMehaffy
999c16f24e
Fix db generated config - pg port 
PG port was wrong when generating the database.js config it was using 3306 instead of 5432 as the default
 2023-02-27 20:07:01 -07:00
Convly
948dbb3121 v4.7.0 v4.7.0 2023-02-27 20:33:14 +01:00
Jean-Sébastien Herbaux
8cdc2b4d64
Merge pull request #15607 from strapi/features/data-transfer 2023-02-27 19:39:03 +01:00
Convly
b502f188b5 Fix unit test 2023-02-27 19:30:26 +01:00
Jean-Sébastien Herbaux
03cb2b91ae
Merge pull request #15935 from strapi/data-transfer/disable-transfer-when-missing-salt 2023-02-27 19:14:14 +01:00
Convly
9afb0ad86d Check token salt on hash 2023-02-27 19:10:04 +01:00
Simone
d781fee4c7
Merge pull request #15934 from strapi/data-transfer/fix-translations 
Fix translations and remove useless file
 2023-02-27 19:07:16 +01:00
Convly
ae23359954 Emit a warning when the feature is enabled but salt is not set 2023-02-27 18:55:16 +01:00
Simone Taeggi
d8b3e5559f fix missing translations, remove unused file 2023-02-27 18:41:50 +01:00
Ben Irvin
13099b4c55 Send error status when token salt not set 
Co-authored-by: Jean-Sébastien Herbaux <Convly@users.noreply.github.com>
 2023-02-27 17:56:23 +01:00
Fernando Chávez
e66228b24c
Merge pull request #15926 from strapi/fix/display-name-on-audit-logs 
[Audit Logs] Use username or email on audit logs page
 2023-02-27 16:27:36 +01:00
Simone Taeggi
301a6fd0f6 Merge branch 'features/data-transfer' into data-transfer/limit-token-name-length 2023-02-27 16:21:23 +01:00
Marc-Roig
808d4a4c03 add example of how to set up a private s3 bucket 2023-02-27 16:18:38 +01:00
Convly
928cfe9928 Merge branch 'releases/4.7.0' into features/data-transfer 2023-02-27 16:12:27 +01:00
Convly
e366e030c5 Fix conflict for en translation 2023-02-27 16:10:52 +01:00
Convly
98c0b9f500 Merge branch 'main' into releases/4.7.0 2023-02-27 16:09:41 +01:00
Ben Irvin
509e97bd02
Merge pull request #15928 from strapi/data-transfer/fix-uuid-err 2023-02-27 15:14:51 +01:00
Fernando Chavez
793df833bb fix test failing 2023-02-27 15:08:14 +01:00
Alexandre BODIN
d6098036a3
Merge pull request #15929 from strapi/chore/ee-users-delete-reload 2023-02-27 14:52:08 +01:00
Gustav Hansen
1b9f26cecc Users: Refetch EE license-data after inviting or deleting 2023-02-27 13:57:12 +01:00
Josh
739fd86b98
Merge pull request #15794 from hide-me/main 2023-02-27 12:51:03 +00:00
Ben Irvin
731e2cf4c9 allow sending errors without uuid 2023-02-27 13:49:49 +01:00
Alexandre Bodin
461f2862dd Merge branch 'main' into releases/4.7.0 2023-02-27 13:46:19 +01:00
Gustav Hansen
017cf37198 Users: Refetch all users after one has been deleted 2023-02-27 13:40:25 +01:00
Gustav Hansen
3f2ca68e05
Merge pull request #15924 from strapi/chore/users-list-refetch 
Settings: Re-fetch users list every time
 2023-02-27 13:24:29 +01:00
Jamie Howard
7da22885ad chore(content-manager): PR feedback 2023-02-27 11:50:49 +00:00
Gustav Hansen
da4d4adc59 Users: Refactor list-page tests 2023-02-27 12:15:18 +01:00
Alexandre BODIN
c822928169
Merge pull request #15734 from strapi/chore/ee-seats 2023-02-27 11:58:04 +01:00
Marc
3998baf082
Merge pull request #15894 from strapi/documentation/reordering 2023-02-27 11:33:44 +01:00
Fernando Chavez
9bb9a58a6a show displayname on audit logs modal 2023-02-27 10:45:53 +01:00
Fernando Chavez
0970aef429 Merge branch 'main' of github.com:strapi/strapi into fix/display-name-on-audit-logs 2023-02-27 10:35:05 +01:00
Fernando Chavez
eaf85737aa change getSanitizedUser fn on audit logs to use username and email 2023-02-27 10:31:34 +01:00
Gustav Hansen
bdac89a166 Settings: Re-fetch users list every time 2023-02-27 10:23:45 +01:00
Marc
88faa92af9
Merge pull request #14670 from strapi/fix/required-media-field-in-api 2023-02-27 10:00:53 +01:00
Paul
42e8cef3ba Translation updates 
Deleting plugin name and description strings

Make translation more accurate

Update and improve russian

Added missing strings

More accurate style

Added plugin name

Correction of JSON style

Delete empty file

Added plugin name

Delete empty file

Added plugin name

Delete empty file

Added plugin name

Delete empty file

Added Russian

Delete empty file

Delete empty file

Added plugin name

Delete empty file

Delete empty file

Added plugin name

Delete empty file

Delete empty file

Added plugin name

Added plugin name

Added plugin name

Added plugin name

Delete empty file

Delete empty file

Delete empty file

Added plugin name

Added plugin name

Added plugin name

Added plugin name

Added plugin name

Added plugin name

Delete empty file

Added plugin name

Added plugin name

Added plugin name

Added plugin name

Added plugin name

Added plugin name

Added plugin name

Added plugin name

Added Russian

Added plugin name

Correction of terminology

JWT is acronym.

Correction of terminology

JWT is acronym.

Correction of terminology

Correction of terminology

JWT is acronym.
Swagger UI  — the correct version.

Correction of terminology

Correction of terminology

JWT is acronym.
Swagger UI  — the correct version.

Correction of terminology

JWT is acronym.

Correction of terminology

Correction of terminology

Correction of terminology

JWT is acronym.
Swagger UI  — the correct version.

Correction of terminology

Correction of terminology

Correction of terminology

JWT is acronym.
Swagger UI  — the correct version.

Correction of terminology

JWT is acronym.

Correction of terminology

JWT is acronym.

Correction of terminology

JWT is acronym.
Swagger UI  — the correct version.

Correction of terminology

JWT is acronym.

Correction of terminology

JWT is acronym.

Correction of terminology

JWT is acronym.

Correction of terminology

Correction of terminology

Correction of terminology

JWT is acronym.

Updated Russian
 2023-02-27 08:33:40 +00:00
Simone Taeggi
3ef0a7d2aa Merge branch 'features/data-transfer' into data-transfer/limit-token-name-length 2023-02-27 09:32:47 +01:00
Alexandre Bodin
52c7eba65b fix tests missing useRBAC mock 2023-02-26 20:44:41 +01:00
Alexandre Bodin
879398552f Add missing RBAC check in the FE & fix lodash fp/no fp errors 2023-02-26 19:12:28 +01:00
Alexandre Bodin
2d48bf2ba0 Lodash usage consistency 2023-02-26 18:12:18 +01:00
fuwanhong
73b225f3c7 chore: update zh-Hans translation 2023-02-25 17:07:29 +08:00
fuwanhong
0aa5e6140a chore: update zh-Hans translation 2023-02-25 13:01:47 +08:00
Alexandre Bodin
834fdaba12 Handle undefined disabledUsers 2023-02-24 20:54:24 +01:00
Alexandre Bodin
69df3d050e Update seat-form url 2023-02-24 19:50:53 +01:00
Alexandre Bodin
f552aa9aa2 Apply feedbacks 2023-02-24 18:55:55 +01:00
Bassel
117579f4c1 replacing map with for, for async functions 
Co-authored-by: Christian <christiancp100@gmail.com>
Co-authored-by: Jean-Sébastien Herbaux <Convly@users.noreply.github.com>
 2023-02-24 17:30:42 +02:00
Simone
8bfdabb7ba
Merge branch 'features/data-transfer' into data-transfer/limit-token-name-length 2023-02-24 15:49:41 +01:00
Simone Taeggi
6d96fa0349 Merge branch 'features/data-transfer' into data-transfer/limit-token-name-length and fix conflicts 2023-02-24 15:44:27 +01:00
Jean-Sébastien Herbaux
3d6a31eb08
Merge pull request #15837 from strapi/data-transfer/tracking-api-token-transfer-token 2023-02-24 15:43:30 +01:00
Jean-Sébastien Herbaux
fd87132a03
Merge pull request #15902 from strapi/data-transfer/fix-transfer-transaction-close 2023-02-24 15:42:42 +01:00
Convly
163ff97fa7 Send a null payload to force the stream end event on the push controller 2023-02-24 15:41:31 +01:00