yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-21 16:10:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,157 Commits 109 Branches 484 Tags
Commit Graph

630 Commits

Author SHA1 Message Date
soupette
f22d20e61b Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-24 16:13:02 +02:00
soupette
8cc31618b3 Merge branch 'releases/v4' of github.com:strapi/strapi into improve-bundle 2021-08-24 15:08:34 +02:00
Alexandre Bodin
f528a865cb Merge branch 'master' of github.com:strapi/strapi into releases/v4 2021-08-19 10:12:58 +02:00
Alexandre Bodin
5202c4ed5c v3.6.7 2021-08-19 09:32:12 +02:00
soupette
48239ab116 Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-19 09:30:45 +02:00
HichamELBSI
f568ce08bd Fix PR feedback 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-08-16 18:38:24 +02:00
HichamELBSI
b97383ff18 Migrate SSO providers view 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-08-12 17:10:04 +02:00
Alexandre Bodin
11afe17575 Init new REST API format and remove count as it is included in pagination 2021-08-11 11:12:56 +02:00
Alexandre Bodin
9c74f0a84e Fix some database schema sync 2021-08-10 09:36:02 +02:00
Alexandre Bodin
38e435c165 Remove old hook 2021-08-09 18:38:17 +02:00
Alexandre BODIN
d54610dc06
Remove hooks (#10711) 2021-08-09 17:33:02 +02:00
Alexandre Bodin
7f5ca6b479 Fix db config for pg and mysql in getstarted 2021-08-06 09:18:11 +02:00
Alexandre Bodin
805e7fdb4b Merge branch 'master' into releases/v4 2021-08-04 19:24:10 +02:00
Alexandre Bodin
1941cfbf4d Add a generic subscriber to run the model lifecycles 2021-08-04 17:47:38 +02:00
Alexandre Bodin
e63fb9d509 v3.6.6 2021-08-04 17:06:51 +02:00
Alexandre Bodin
10ef480bc0 Move logger out of Strapi.js 2021-08-03 09:12:58 +02:00
Alexandre Bodin
a0011840e8 Merge admin config into strapic config 2021-08-03 08:33:56 +02:00
Alexandre Bodin
16b01043d7 Fix CTB inversion of dominance in relations 2021-07-30 14:53:57 +02:00
Alexandre Bodin
89fee54582 Merge branch 'v4/backend' into v4/database 2021-07-30 09:50:40 +02:00
Alexandre Bodin
4d471a50a8 Update CTB validations for morphs 2021-07-30 09:44:17 +02:00
Alexandre Bodin
651577baa6 Remove morph relations from the CM infos 2021-07-29 14:39:28 +02:00
soupette
55ad0c0181 Update plugin generators 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-28 08:22:59 +02:00
soupette
a261bd7150 Add extensions 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-27 09:29:23 +02:00
soupette
7b0278e2a0 Rename admin.config.js to app.js 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-27 08:27:19 +02:00
soupette
edd18023ad Add admin bootstrap customisation 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-27 08:25:24 +02:00
cyril lopez
87c0207b93
Merge pull request #10641 from strapi/remove-plugin-extension 
Remove plugins customisations
 2021-07-23 11:11:23 +02:00
soupette
16ded2e987 Rename webpack config file 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-22 15:45:19 +02:00
soupette
144904cf1e Remove plugins customisations 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-22 14:51:29 +02:00
soupette
ae38481de8 Split app customisation file and webpack config 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-21 15:47:55 +02:00
soupette
900388755f Rename boot lifecycle to bootstrap 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-21 09:05:20 +02:00
soupette
ce2c05b27c Migrate remove field action to immer 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-12 19:11:55 +02:00
Alexandre Bodin
63b503f676 Wip 2021-07-08 21:53:30 +02:00
Alexandre Bodin
81dd94c6ec Refactor all query() calls 2021-07-08 18:15:32 +02:00
soupette
4a683479ce Remove immutable in CM 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-08 15:38:56 +02:00
soupette
88b601c26b Add missing tests in CM 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-08 14:01:13 +02:00
Alexandre Bodin
3711ca3072 wip 2021-07-02 02:26:14 +02:00
Alexandre Bodin
2d59716f5d Cleanup CTB 2021-06-30 22:52:12 +02:00
Alexandre Bodin
b5856aa624 Init link query entity service 2021-06-30 20:00:03 +02:00
Alexandre Bodin
b4ecb48c44 Remove mongoose connector 2021-06-29 16:27:35 +02:00
Alexandre Bodin
fe4e355b24 Branch i18n bootstrap 2021-06-28 22:37:19 +02:00
Alexandre Bodin
d5b96c6e97 fromRow - toRow 2021-06-28 21:37:44 +02:00
Alexandre Bodin
a1e2fc6829 Init fields 2021-06-28 12:34:29 +02:00
Alexandre Bodin
bdbf90b567 wip 2021-06-24 18:28:36 +02:00
soupette
1ce1101fc4 Remove request helper and use axiosInstance in CM 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-24 14:06:41 +02:00
soupette
b775f7614a Remove request helper in CM collectionTypeFormWrapper 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-24 14:02:01 +02:00
Alexandre Bodin
a992a73b2e Update model relation definition 2021-06-24 09:09:30 +02:00
Alexandre Bodin
5e46f2999e Remove connection 2021-06-24 09:09:29 +02:00
Alexandre Bodin
d0af0a5b8e wip 2021-06-24 09:09:28 +02:00
Alexandre BODIN
eda51cc08a
Merge pull request #10518 from strapi/drop-node-10 
Drop support for node10
 2021-06-23 18:32:04 +02:00
Alexandre Bodin
356ee09ed2 Merge branch 'master' into releases/v4 2021-06-23 18:23:54 +02:00