yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-01 10:23:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,749 Commits 121 Branches 507 Tags
Commit Graph

16749 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cyril lopez
c4adf3790a
Merge pull request #10569 from strapi/core/switch-plan 
Allow to switch plan at runtime
 2021-07-05 11:47:07 +02:00
soupette
248dd27618 Fix BE tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-05 11:46:36 +02:00
soupette
dc303bcd62 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-05 11:35:33 +02:00
soupette
d7a7bbbd01 Fix admin dev 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-05 11:24:24 +02:00
soupette
e04ccb417e Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-05 11:20:21 +02:00
soupette
46ae14f532 Enable plan switch at runtime 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-01 15:50:11 +02:00
soupette
12bdb204e0 Add temp route to check the switch at runtime 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-01 14:30:52 +02:00
soupette
dbfcfa211d Created custom plugin to switch from ee to ce at runtime 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-01 14:19:50 +02:00
cyril lopez
2e7cf60a78
Merge pull request #10531 from strapi/chore/move-cm-in-core 
Move Content manager in @strapi/admin
 2021-07-01 12:48:24 +02:00
cyril lopez
45e6612f7e
Merge pull request #10559 from strapi/refacto-filters-in-cm 
Refactoring the filter in CM
 2021-07-01 08:26:47 +02:00
mfrachet
14b1da7b2f fix review 2021-07-01 07:54:01 +02:00
mfrachet
811c9b84ee fix datetime 2021-06-30 08:53:24 +02:00
mfrachet
2671d3fab0 Fix review comments 2021-06-30 08:52:49 +02:00
mfrachet
e144a50af8 revert console log 2021-06-29 10:50:33 +02:00
mfrachet
5024d21327 First commit of tests (setup) 2021-06-29 10:47:19 +02:00
mfrachet
321ed4041c AttributeFilter in CM 2021-06-29 09:08:33 +02:00
cyril lopez
f3c76c29d8
Merge pull request #10554 from strapi/core/prebuild-admin 
Prebuild admin panel
 2021-06-28 10:41:22 +02:00
soupette
62b4cc257e Create build script 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-28 09:51:41 +02:00
soupette
c7681b165d Change favicon 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-28 08:53:45 +02:00
cyril lopez
3eddff2adb
Merge pull request #10537 from strapi/chore/move-cm-admin 
Move CM admin files in @strapi/admin
 2021-06-25 10:18:37 +02:00
cyril lopez
dbfbca533b
Merge pull request #10544 from strapi/cm/change-routing 
[WIP] Change content manager routing
 2021-06-25 10:12:25 +02:00
soupette
104ebc25ec Update CM routing 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-25 09:44:29 +02:00
cyril lopez
48472ae322
Merge pull request #10543 from strapi/chore/cm-remove-pluginID 
Chore/cm remove pluginId
 2021-06-25 09:43:18 +02:00
soupette
b6171dc3ee Remove permissions file 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-24 16:20:01 +02:00
soupette
47d8d1cbd0 Remove pluginID completely 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-24 16:20:00 +02:00
soupette
fc34a41f36 Remove useless files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-24 16:20:00 +02:00
cyril lopez
6128a5442a
Merge pull request #10542 from strapi/chore/migrate-cm-axios 
Remove request helper use in CM
 2021-06-24 16:19:15 +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
cyril lopez
c9d0dd4942
Merge pull request #10541 from strapi/core/load-cm 
Load CM in admin
 2021-06-24 13:36:33 +02:00
soupette
cff2e5247e Update CM s injection zones 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-24 10:31:00 +02:00
soupette
23a2e8f6e3 Created InjectionZone component for core/admin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-24 10:30:59 +02:00
soupette
40e2cc69ac Move cm dependencies in core/admin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-24 10:30:59 +02:00
soupette
d2b2ea50f0 Move cm link in the menu 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-24 10:30:59 +02:00
soupette
4dc122664f Created Providers component 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-24 10:30:58 +02:00
cyril lopez
912f2695a0
Merge pull request #10540 from strapi/core/admin-as-plugin 
Make the admin a plugin
 2021-06-24 10:29:23 +02:00
soupette
e6544db5a0 Make admin a plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-24 08:30:41 +02:00
soupette
04561e08c1 Move CM files in core/admin and load cm reducers 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-24 08:29:49 +02:00
cyril lopez
7abb2b6ddf
Merge pull request #10536 from strapi/chore/move-trads 
Move CM trads in @strapi/admin
 2021-06-24 08:16:39 +02:00
soupette
c1cb6d1d0d Fix lint 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-23 20:18:13 +02:00
soupette
2daff51e1b Move CM trads 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-23 19:05:53 +02:00
soupette
14a4e2b531 Clean trads 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-23 19:03:52 +02:00
soupette
4347b7f405 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-23 19:00:14 +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
Alexandre Bodin
6f7e0c27e7 v3.6.5 v3.6.5 2021-06-23 15:44:38 +02:00
Alexandre Bodin
336ef25b55 Fix create-strapi app missing files 2021-06-23 15:43:49 +02:00
Alexandre Bodin
37de70c4f9 v3.6.4 v3.6.4 2021-06-23 15:19:11 +02:00
Alexandre Bodin
d1456d961e Update yarn lock 2021-06-23 15:18:00 +02:00
Alexandre BODIN
157f6cdc3b
Merge pull request #10433 from strapi/feat/interactive-cli 
[CLI] Add interactive options for templates and starters
 2021-06-23 15:16:24 +02:00