yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 16:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,303 Commits 129 Branches 498 Tags
Commit Graph

17303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
56600eca2a Move admin lifecycle functions and rename models to content-types 2021-08-23 22:04:15 +02:00
Alexandre Bodin
3de76e484c Start to do some cleanup 2021-08-23 21:50:13 +02:00
Alexandre BODIN
eedab35068
Merge pull request #10784 from strapi/v4/fix/reload 
fix bad reloading when UP JWT was written in .env
 2021-08-23 19:42:16 +02:00
Pierre Noël
b592b855a3 fix bad reloading when UP JWT was written in .env 2021-08-23 19:26:13 +02:00
Alexandre Bodin
5d7e6cdc67 Put modelType back 2021-08-23 18:41:07 +02:00
Mark Kaylor
4e7afbd0da start fix for generate api in ctb 2021-08-23 18:23:21 +02:00
Alexandre Bodin
fd255077e3 Fix merge conflicts 2021-08-23 16:45:44 +02:00
markkaylor
b1ff616fd5 add generators to cli (#10779) 
* add generators to cli

* add strapi generate comment

* remove old generators

* rename generator-cli -> generate

* list generators alphabetically

* update package description

* add check for strapi app in cwd
 2021-08-23 16:17:54 +02:00
Rémi de Juvigny
439103e4cf Add API plop generator (#10769) 2021-08-23 16:11:37 +02:00
Mark Kaylor
ef028c983d move dot files to files folder 2021-08-23 16:11:37 +02:00
Mark Kaylor
10bf5d3987 add plugin generator 2021-08-23 16:11:37 +02:00
Rémi de Juvigny
63be221944 Add policy and controller generators (#10760) 2021-08-23 16:11:36 +02:00
Mark Kaylor
e9d1973320 add models 2021-08-23 16:11:36 +02:00
Rémi de Juvigny
4e19ff006f Prompt wording 2021-08-23 16:11:36 +02:00
Rémi de Juvigny
b32e68c9f1 Create new plop generator 2021-08-23 16:11:36 +02:00
Alexandre BODIN
522d6afd54
Merge pull request #10414 from strapi/pluginAPI/loadPlugin 
Loading plugins with strapi-server.js
 2021-08-23 15:42:53 +02:00
Pierre Noël
87df0510c7 append: use fse instead of fs 2021-08-23 15:27:34 +02:00
Alexandre Bodin
cf1d5dc33c Remove unneeded extension 2021-08-23 15:09:19 +02:00
Alexandre Bodin
1350b1cc92 Merge branch 'releases/v4' into pluginAPI/loadPlugin 2021-08-23 14:23:51 +02:00
Alexandre BODIN
918b0fad17
Merge pull request #10781 from strapi/v4/rest-api 
Cleanup convert sort params
 2021-08-23 14:23:09 +02:00
Alexandre Bodin
ba8d082188 Cleanup sort 2021-08-23 10:51:32 +02:00
Alexandre BODIN
081fe0041b
Merge pull request #10772 from strapi/v4/plugin-api/migrate-get-started-api 
migrate getStarted api
 2021-08-23 10:51:00 +02:00
Alexandre BODIN
bedf34a69a
Update homepage.settings.json 2021-08-23 10:34:02 +02:00
Pierre Noël
514fc00d97 migrate getStarted api 2021-08-23 09:58:15 +02:00
Pierre Noël
bc56be3560 Merge branch 'pluginAPI/loadPlugin' of github.com:strapi/strapi into pluginAPI/loadPlugin 2021-08-20 16:32:14 +02:00
soupette
d8209894fa Fix admin development 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-20 15:30:54 +02:00
Pierre Noël
09945a46df fixes 2021-08-20 15:23:02 +02:00
Alexandre BODIN
4c2c7d4b01
Merge pull request #10765 from strapi/plugin-api/migrate-getters 
Migrate plugin getters
 2021-08-20 13:51:29 +02:00
Alexandre Bodin
8252a51ba5 Use a registry for the plugins 2021-08-20 13:12:37 +02:00
Alexandre Bodin
575cbbdc7c Migrate plugin getters 2021-08-19 23:30:49 +02:00
Alexandre Bodin
c3642a4f10 Merge branch 'v4/backend' into pluginAPI/loadPlugin 2021-08-19 23:29:55 +02:00
Alexandre Bodin
4fbd411f69 Fix lint 2021-08-19 23:28:29 +02:00
Derrick Mehaffy
a46cb75f81 Swap out Slack/Discord and cleanup old social links 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2021-08-19 14:26:58 -07:00
Pierre Noël
98719b6c64 migrate plugin structures to V4 2021-08-19 16:49:33 +02:00
Alexandre Bodin
f528a865cb Merge branch 'master' of github.com:strapi/strapi into releases/v4 2021-08-19 10:12:58 +02:00
soupette
393bf5f1be Fix PR feedback 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-19 09:42:19 +02:00
Alexandre Bodin
5202c4ed5c v3.6.7 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
Richard Nsama
fb7f280e1a
Added a POST route to the SSO routes to support SAML login callbacks (#10690) 2021-08-19 09:29:11 +02:00
Alexandre Bodin
84984cf030 Fix singleType entity service find 2021-08-18 19:49:13 +02:00
Pierre Noël
682e877644 Merge branch 'v4/backend' into pluginAPI/loadPlugin 2021-08-18 18:37:57 +02:00
Alexandre Bodin
9baf1af73e Fix i18n copy attributes 2021-08-18 16:57:18 +02:00
Pierre Noël
65a89df6f2
Merge pull request #10752 from strapi/v4/plugin-api/extensions 
V4/plugin api/extensions
 2021-08-18 12:10:16 +02:00
Pierre Noël
c547e64571 fix e2e tests 2021-08-18 11:58:17 +02:00
markkaylor
c3eff49770
add tracking event to strapi awesome banner (#10701) 2021-08-18 11:12:21 +02:00
Alexandre Bodin
d36c03727b Add case insensitive operators for contains 2021-08-18 09:46:09 +02:00
Mike Casebolt
192653cce9
remove newline at end 2021-08-17 17:34:48 -07:00
Mike Casebolt
694ac5c1cb
fix grammar 
"You are logged as the first administrator." -> "You are logged in as the first administrator."
 2021-08-17 17:29:08 -07:00
Alexandre Bodin
a4d3ac34bd Merge branch 'master' into releases/v4 2021-08-17 19:10:29 +02:00
Alexandre Bodin
a041d76d8a Fix tests conflicting 2021-08-17 18:54:20 +02:00