yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-17 11:08:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,428 Commits 112 Branches 504 Tags
Commit Graph

392 Commits

Author SHA1 Message Date
ivanThePleasant
b51b0f4616 Merge branch 'main' into chore/user-level-data 2022-09-21 10:24:18 +03:00
Julie Plantey
c0dc795586 updated DS version and snapshots 2022-09-20 17:18:24 +02:00
David Lüder
14821c6ac5 Fix intlLabel for $ne-Filter for correct translations 2022-09-08 15:00:08 +00:00
ivanThePleasant
3759c2885e Change analytics url endpoint, refactor all senders to the new api format 2022-09-06 09:07:11 +03: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
Julie Plantey
f81f74d733 remove LoadingIndicator 2022-08-30 14:14:03 +02:00
Julie Plantey
5a80b2ce6f LoadingMessage component for ReactSelect 2022-08-29 16:02:19 +02:00
ivanThePleasant
a1ea7439ea Merge branch 'main' into chore/user-level-data 2022-08-25 15:21:39 +03:00
Julie Plantey
6d654db039 Merge branch 'master' of https://github.com/strapi/strapi into fix/dynamic-tables-headers-translations 2022-08-16 16:43:17 +02:00
ivanThePleasant
459de9774d Refactor hash function, add uuid to the admin hash, remove debug console logs 2022-08-16 11:58:15 +03:00
ivanThePleasant
7e5b38d588 Merge branch 'master' into chore/user-level-data 2022-08-11 18:28:58 +03:00
Julie Plantey
6e35080c82 CM LV table headers translations 2022-08-11 15:37:07 +02:00
ivanThePleasant
631ee554d0 Swap back analytics url to the correct one, change property name 2022-08-11 15:58:53 +03:00
Alexandre Bodin
92955d19f9 Frontend updates 2022-08-11 10:20:49 +02:00
Alexandre Bodin
cf49ddbbfc Prettier and backend fix 2022-08-11 10:20:49 +02:00
ivanThePleasant
7291d2e6cf Change user hashing to be a service on admin, introduce adminUserId property to the send function, refactor several events 2022-08-09 12:20:25 +03:00
Gustav Hansen
d9a7e21abe chore: Update snapshot tests 2022-08-01 15:28:01 +02:00
Gustav Hansen
7e3c08ba3e Merge branch 'releases/4.3.0' into features/ML-folder 2022-07-27 12:57:38 +02:00
Convly
ba91f47f04 Merge branch 'master' into releases/4.3.0 2022-07-27 12:55:48 +02:00
Convly
2d6afbf044 Merge branch 'releases/4.3.0' into features/ML-folder 2022-07-27 10:32:43 +02:00
Simone
af565b0cf7
Merge pull request #13815 from strapi/fix/ui-bug-datetimepicker-from-another-locale-13674 
fix/ui-bug-datetimepicker-from-another-locale-13674
 2022-07-27 10:09:28 +02:00
Convly
a4c2f3b46a Merge branch 'master' into releases/4.3.0 2022-07-27 09:44:31 +02:00
Convly
0b8c7b59c6 Merge branch 'master' into features/typescript 2022-07-25 09:30:18 +02:00
杨飞
72cb1eb4ee Fixed the translation problem of zh-Hans on the user list page. 2022-07-24 11:40:35 +08:00
Gustav Hansen
01784575bf Merge branch 'master' into features/ML-folder 2022-07-22 12:48:41 +02:00
Simone Taeggi
cf3cbb34fe add args control to the datetimepicker storybook file 2022-07-21 17:04:10 +02:00
Simone Taeggi
d535d3bb72 update tests with correct locale date format 2022-07-21 11:06:06 +02:00
Simone Taeggi
def292d7cd fix a snapshot and a unit test date format 2022-07-20 15:55:48 +02:00
Simone Taeggi
95acecff90 add some test to check the correct rerendering of a new value 2022-07-20 15:04:36 +02:00
Simone Taeggi
4ae0650fea refactor the if else block based on PR comments 2022-07-20 14:28:37 +02:00
Simone Taeggi
10ac7ccf58 Merge branch 'master' into fix/ui-bug-datetimepicker-from-another-locale-13674 2022-07-20 12:22:03 +02:00
Julie Plantey
e457aee5c9 Merge pull request #13776 from yangfei4913438/translate 
add several items in zh-Hans and fixed some other minor bugs.
 2022-07-20 12:09:52 +02:00
ivanThePleasant
cc4a3ba507 Add environment to the admin analytics calls the correct way 2022-07-20 11:05:26 +03:00
ivanThePleasant
ae35914dba Add environment property to admin telemetry calls 2022-07-13 16:55:33 +03:00
Convly
a5fbcc9e48 Merge branch 'master' into features/typescript 2022-07-07 15:20:34 +02:00
Julie Plantey
034e03fe0d
Merge pull request #13681 from strapi/ML-folder/track-events-front 
[ML Folder] Track events front
 2022-07-06 18:05:29 +02:00
ronronscelestes
d4da38191f fixed focused border and added box shadow 2022-07-05 17:43:53 +02:00
Julie Plantey
dd38b618e7
Merge pull request #13687 from strapi/ML-folder/fix-select-tree-disabled 
[ML Folder] Select Tree disabled state
 2022-07-05 17:19:25 +02:00
ronronscelestes
f383fbb6a7 feedback fixes 2022-07-05 16:14:51 +02:00
ronronscelestes
19cdf1e298 feedback fixes 2022-07-05 15:43:41 +02:00
ronronscelestes
fe607a162a Merge branch 'features/ML-folder' of https://github.com/strapi/strapi into ML-folder/track-events-front 2022-07-05 15:14:57 +02:00
Gustav Hansen
4fcb38d53d Merge branch 'master' into features/ML-folder 2022-07-05 12:53:51 +02:00
ronronscelestes
9b6785a697 fixed select tree disabled state + style 2022-07-05 11:32:32 +02:00
Julie Plantey
8d85946290
Merge pull request #13533 from yangfei4913438/fix-content-types-builder 
fix: content-types builder search button tooltip
 2022-07-05 09:25:26 +02:00
杨飞
a366392f67 merge pr #13536 2022-06-28 11:42:03 +08:00
ronronscelestes
5cbaf24336 feedback improvements handleChange 2022-06-23 17:16:57 +02:00
ronronscelestes
45086ec764 didSelectAllMediaLibraryElements, didFilterMediaLibraryElements, didSortMediaLibraryElements, didSearchMediaLibraryElements, didAddMediaLibraryFolders 2022-06-23 10:54:13 +02:00
ronronscelestes
55de6ad9f8 fix using theme in getSelectStyles 2022-06-21 09:08:49 +02:00
ronronscelestes
14717d5fd0 fixed active style of React Select option 2022-06-20 21:21:57 +02:00