yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-31 18:08:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,919 Commits 121 Branches 507 Tags
Commit Graph

73 Commits

Author SHA1 Message Date
Alexandre Bodin
00a43df7bf Fix bug after merge 2021-09-21 15:32:49 +02:00
Alexandre Bodin
5b0ac47435 Merge branch 'releases/v4' into v4/db-migrations 2021-09-21 15:17:02 +02:00
Alexandre Bodin
4eea2b1569 Fix test and upgrade github workflows 2021-09-21 15:14:26 +02:00
Alexandre Bodin
c173fa416e wip 2021-09-15 19:53:15 +02:00
Pierre Noƫl
de4579b25e change project structure to use /src folder 2021-09-15 16:41:36 +02:00
Pierre Noƫl
13cec4cadb append strapi.dir to plugin path if relative 2021-09-02 12:14:44 +02:00
Alexandre BODIN
c1bc942632
Merge pull request #10846 from strapi/v4/rest-api 
v4/rest api
 2021-09-02 10:05:17 +02:00
Pierre Noƫl
56ffa3a63f migrate myplugin to v4 2021-09-01 18:38:40 +02:00
Alexandre Bodin
4b81731941 Fix tests 2021-08-31 19:31:32 +02:00
Alexandre Bodin
b44a552eee Implement REST API pagination with paged or offset and withCount 2021-08-31 19:31:31 +02:00
Pierre Noƫl
9362311924 add extend fn to controller registry 2021-08-30 11:00:30 +02:00
Pierre Noƫl
c547e64571 fix e2e tests 2021-08-18 11:58:17 +02:00
Pierre Noƫl
f4981dd8e7 Merge branch 'v4/backend' into pluginAPI/loadPlugin 2021-08-10 15:33:06 +02:00
Alexandre Bodin
9c74f0a84e Fix some database schema sync 2021-08-10 09:36:02 +02:00
Pierre Noƫl
18da6e2188 Merge branch 'v4/backend' into pluginAPI/loadPlugin 2021-08-09 11:06:34 +02:00
Alexandre Bodin
7f5ca6b479 Fix db config for pg and mysql in getstarted 2021-08-06 09:18:11 +02:00
Pierre Noƫl
dd0c095f1e Merge branch 'v4/backend' into pluginAPI/loadPlugin 2021-08-04 15:05:56 +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
Pierre Noƫl
eabe72f92e WIP 2021-07-26 16:59:59 +02:00
Pierre Noƫl
9c41753e8a remove comments 2021-07-23 10:33:25 +02:00
Alexandre Bodin
81dd94c6ec Refactor all query() calls 2021-07-08 18:15:32 +02:00
Alexandre Bodin
3711ca3072 wip 2021-07-02 02:26:14 +02:00
Pierre Noƫl
07d17f2cb2 WIP 2021-06-29 16:11:47 +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
5e46f2999e Remove connection 2021-06-24 09:09:29 +02:00
Alexandre Bodin
d0af0a5b8e wip 2021-06-24 09:09:28 +02:00
Pierre Noƫl
7f441632c0 wip 2021-06-08 10:39:45 +02:00
Pierre Noƫl
f97c775566 loading plugins with strapi-server.js 2021-05-31 18:28:42 +02:00
Alexandre Bodin
02342ace0a Use objects instead of strings to declare queries & mutattions 2021-04-08 13:26:03 +02:00
Alexandre Bodin
0e1595d629 Allow cach-control in example app to work with rapidoc 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-03 15:59:37 +01:00
AbdĆ³n RodrĆ­guez Davila
d2ef1d4b8c
Allow more options to the Apollo Server config (#7665) 
* Extract server config to a constant

Signed-off-by: AbdĆ³n RodrĆ­guez Davila <a@abdonrd.com>

* Omit options to server config

Signed-off-by: AbdoĢn RodriĢguez Davila <a@abdonrd.com>

* Move default config to serverParams

Signed-off-by: AbdoĢn RodriĢguez Davila <a@abdonrd.com>

* Simplify Apollo server config

Signed-off-by: AbdoĢn RodriĢguez Davila <a@abdonrd.com>

* Simplify with a new apolloServerConfig property

Signed-off-by: AbdoĢn RodriĢguez Davila <a@abdonrd.com>

* Update tracing documentation

Signed-off-by: AbdoĢn RodriĢguez Davila <a@abdonrd.com>

* Extract deprecated options

Signed-off-by: AbdoĢn RodriĢguez Davila <a@abdonrd.com>

* Add default options

Signed-off-by: AbdoĢn RodriĢguez Davila <a@abdonrd.com>

* Update documentation

Signed-off-by: AbdoĢn RodriĢguez Davila <a@abdonrd.com>

* Rename to deprecatedApolloServerConfig

Signed-off-by: AbdoĢn RodriĢguez Davila <a@abdonrd.com>

* Empty default options

Signed-off-by: AbdoĢn RodriĢguez Davila <a@abdonrd.com>

* Update default config

Signed-off-by: AbdoĢn RodriĢguez Davila <a@abdonrd.com>

* Add warning note

Signed-off-by: AbdoĢn RodriĢguez Davila <a@abdonrd.com>

* Add documentation note

Signed-off-by: AbdoĢn RodriĢguez Davila <a@abdonrd.com>

* Update documentation note

Signed-off-by: AbdoĢn RodriĢguez Davila <a@abdonrd.com>

* Fix the config check

Signed-off-by: AbdoĢn RodriĢguez Davila <a@abdonrd.com>

* Fix the config check

Signed-off-by: AbdoĢn RodriĢguez Davila <a@abdonrd.com>

* Refactor old code and rename param to appoloServer to avoid redondancy

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

* Fix typo

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-09-04 09:51:11 +02:00
Alexandre Bodin
e597bddc59 Add tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:24:47 +02:00
Alexandre Bodin
a4f294f1c4 Use passport standard error handling 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:24:38 +02:00
Alexandre Bodin
ceb11379fc Add passportjs and refactor login 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:23:50 +02:00
Alexandre Bodin
f2dd146bf4 Clear getstarted config 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-15 19:41:56 +02:00
Pierre Noƫl
bc3cee4c54 sanatize email options 
Signed-off-by: Pierre Noƫl <petersg83@gmail.com>
 2020-05-15 16:39:35 +02:00
Pierre Noƫl
8821f42694 update email settings getstarted 
Signed-off-by: Pierre Noƫl <petersg83@gmail.com>
 2020-05-15 15:47:04 +02:00
Pierre Noƫl
83f847f359 change config format 
Signed-off-by: Pierre Noƫl <petersg83@gmail.com>
 2020-05-14 18:11:24 +02:00
Pierre Noƫl
471d9ef89c move email settings from db to files 
Signed-off-by: Pierre Noƫl <petersg83@gmail.com>
 2020-05-14 16:56:14 +02:00
Alexandre Bodin
0fa1d561cc Readd default host in getstarted 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 16:22:22 +02:00
Alexandre Bodin
6ca740bd29 Fix env casting should return undefined if var is not defined 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:42 +02:00
Alexandre Bodin
8fabd55568 Make generated config as minimalist as possible 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:38 +02:00
Alexandre Bodin
546ca97748 Change CLI config loading 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:38 +02:00
Alexandre Bodin
9e34029878 Overwritte plugin config with user config 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:37 +02:00
Alexandre Bodin
5595f6ca94 Add policy loader 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:36 +02:00
Alexandre Bodin
ed616333b2 Init new configuration management 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:35 +02:00
Alexandre Bodin
59332ae672 Fix host using lcoalhost not working on a lot of envs 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-01 11:14:39 +02:00