yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 08:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,679 Commits 127 Branches 497 Tags
Commit Graph

130 Commits

Author SHA1 Message Date
ivanThePleasant
0b822b8a48 Merge branch 'main' into chore/user-level-data 2022-11-24 13:06:20 +02:00
ivanThePleasant
00a3f69152
Merge pull request #14835 from strapi/chore/fix-iso-locales 
Chore/fix iso locales
 2022-11-24 11:21:32 +02:00
ivanThePleasant
2af669c961 Merge branch 'main' into chore/user-level-data 2022-11-23 09:35:16 +02:00
Pierre Noël
9ff4f19660 fix schema support for postgres when using raw queries 2022-11-17 10:08:49 +01:00
ivanThePleasant
073b79e76b Add new test to check for duplicate iso locales 2022-11-15 11:22:04 +02:00
ivanThePleasant
eab8369fe8 Remove iso locales duplicates and save new tests snapshot 2022-11-10 17:37:04 +02:00
ivanThePleasant
01bb760793 Clean up unnecessary code 2022-09-29 14:15:07 +03:00
ivanThePleasant
5a4362faf7 Refactor changes to use request context 2022-09-29 11:24:11 +03:00
ivanThePleasant
c0588231a6 Merge branch 'main' into chore/user-level-data 2022-09-29 11:23:17 +03:00
Alexandre Bodin
2bc5bdeabd Merge branch 'main' into features/api-token-v2 2022-09-22 10:36:58 +02:00
Julie Plantey
3644f4c24d update unit test snapshot 2022-09-21 14:05:09 +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
Convly
7598190b30 Merge branch 'main' of github.com:strapi/strapi into features/api-token-v2 2022-09-20 15:29:36 +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
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
chris-turner-datacom
b9dd8bcbcc
Add Te Reo Māori locale 2022-09-10 15:10:23 +12: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
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
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
Convly
94978036bc Merge branch 'main' into features/api-token-v2 2022-09-02 09:35:03 +02:00
Convly
e826297051 Remove NOTE 2022-09-01 10:54:32 +02:00
Convly
7d5c1e9b21 Revert add comment 2022-09-01 10:50:44 +02:00
Convly
ccf39e4f2f Merge branches 'fix/i18n-locale-queries-forbidden-access' and 'main' of github.com:strapi/strapi into fix/i18n-locale-queries-forbidden-access 2022-09-01 10:35:35 +02:00
Convly
18e07d8d0f Update comment 2022-09-01 10:30:26 +02:00
Convly
d71ffb2f5d Merge branch 'main' into fix/i18n-locale-queries-forbidden-access 2022-09-01 10:02:09 +02:00
Simone Taeggi
078c4fb96c merge main in features/api-token-v2 2022-09-01 09:50:19 +02:00
Gustav Hansen
45ff887a21 chore: Update backend snapshot tests 2022-08-30 15:44:12 +02:00
Adedoyin Akande
0ad771e44d
Update iso-locales.test.js.snap 
Complete the English "en-" prefix with relevant locales based on https://www.localeplanet.com/icu/
 2022-08-21 20:26:42 +01:00
Adedoyin Akande
aa4b387343
Update iso-locales.json 
Complete the English "en-" prefix with relevant locales based on https://www.localeplanet.com/icu/
 2022-08-21 19:55:40 +01:00
Bassel Kanso
baad6fd93f Merge branch 'main' into features/api-token-v2 2022-08-18 12:18:09 +03:00
ivanThePleasant
7e5b38d588 Merge branch 'master' into chore/user-level-data 2022-08-11 18:28:58 +03:00
ivanThePleasant
f8ac76491f Convert all server events to new format, refactor admin events userAdminId, refactor tests 2022-08-11 15:56:39 +03:00
Alexandre Bodin
cf49ddbbfc Prettier and backend fix 2022-08-11 10:20:49 +02:00
Alexandre Bodin
0ae14c06cb 1st fix pass 2022-08-11 10:20:48 +02:00
Jake Wesorick
e215383a7b Add more locales. smn, smn_FI, se, se_FI, se_NO, se_SE, gd, gd_GB, ug, ug_CN. 2022-08-02 13:37:21 +07:00
Convly
3fa282be30 Merge branch 'master' into api-token-v2/engine-abstraction 2022-07-27 15:46:54 +02:00
Convly
f247f51c36 Update i18n hook name for the permission engine 2022-07-21 10:42:58 +02:00
Julie Plantey
006aeb4cde updated iso locales snapshot 2022-07-11 12:28:29 +02:00
Convly
54c8cbf846 Fix i18n locale queries being forbidden even with the correct permission set 2022-07-01 14:19:07 +02:00
SArkar
421c54309a Add two new kurdish languages 2022-06-17 23:42:14 +03:00
kiri
c85b2a8963 update snapshot 2022-06-09 22:21:02 +07:00
kiri
e63b729dfc kara-kalpak locale 2022-06-01 17:32:41 +07:00
harimkims
e918293fc4 Update sanitizer mocking in i18n test 2022-05-07 17:27:15 +09:00
Kim, Harim
4429381ec9
Merge branch 'strapi:master' into fix/populate-user 2022-05-07 16:45:15 +09:00
Pierre Noël
5193e510b0
Merge pull request #12850 from strapi/fix/bulk-delete-non-default-locale 
Fix bulk delete for non-default locales
 2022-05-04 11:49:22 +02:00