524 Commits

Author SHA1 Message Date
Filipe Medeiros
3b9661acb2
Upgrade dependency version (#6149)
* Ok, now I translated from start to finish

 Should be good to go, some stuff is still in English because it's impossible/worse to translate to PT

Signed-off-by: Filipe <filipesilvamedeiros@gmail.com>

* Updated the dependency. It's a patch, so it shouldn't break anything at all

Signed-off-by: Filipe <filipesilvamedeiros@gmail.com>

* Revert "Ok, now I translated from start to finish"

This reverts commit 7ea0574db78abb6fc0d328465e618b860fff89bb.

Signed-off-by: Filipe <filipesilvamedeiros@gmail.com>
2020-05-12 12:03:15 +02:00
Pierre Noël
57d7d876b7
Fix/#4513/ability to use a sub path behind a proxy (#5833)
* add possibility to use strapi on a non-root base url path

* fix documentation password form

* use server.url and admin.url in config

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* update doc proxy

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* move server.url location in config

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* refacto

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* add possibility to put relative urls

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* allow '/' as an admin url + refacto

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* update yarn.lock

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* refacto

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* Remove default proxy option

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

* fix github provider

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* fix github login

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* Remove files that should be here

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

Co-authored-by: Pierre Noël <pierre.noel@strapi.io>
Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-05-08 13:50:00 +02:00
Alexandre Bodin
f192d5e171 Merge branch 'master' into develop
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-05-07 13:14:23 +02:00
Alexandre Bodin
55c006a6b1 v3.0.0-beta.20.3 2020-05-07 13:02:11 +02:00
Alexandre Bodin
72ad156f20 Merge branch 'master' into develop 2020-05-05 15:01:11 +02:00
Alexandre Bodin
a27d5f210d v3.0.0-beta.20.2 2020-05-05 14:56:13 +02:00
Alexandre Bodin
3bf7947aa0 Remove dead code
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-05-04 10:31:09 +02:00
Alexandre Bodin
1cb92daa77 Normalize usage of strapi.config.get
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-04-29 11:06:39 +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
ed616333b2 Init new configuration management
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-04-29 11:06:35 +02:00
Alexandre Bodin
6a6d53b402 v3.0.0-beta.20.1 2020-04-28 10:00:23 +02:00
Pierre Noël
4b7fbadef5
fix shadow crud breaking build when resolvers are not defined in a plugin (#5899)
* fix shadow crud breaking build when resolvers are not defined in a plugin

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* refacto

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

Co-authored-by: Pierre Noël <pierre.noel@strapi.io>
2020-04-22 15:41:40 +02:00
Alexandre Bodin
9d8944ebfe v3.0.0-beta.20 2020-04-16 15:10:53 +02:00
Alexandre Bodin
cc9d23c3ac Merge branch 'develop' into features/media-lib
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-04-07 20:24:39 +02:00
Alexandre Bodin
ff15757685 Merge tag 'v3.0.0-beta.19.5'
v3.0.0-beta.19.5
2020-04-01 11:31:04 +02:00
Alexandre Bodin
8d56e0c12f v3.0.0-beta.19.5 2020-04-01 11:27:56 +02:00
Long Nguyen
77e243f841 Refactor code convert GraphQL params to ORM conditions
Signed-off-by: Long Nguyen <olragon@gmail.com>
2020-03-31 16:01:39 +02:00
Long Nguyen
634592fb5b fix: GraphQL Aggregation Bookshelf where condition aren't applied to groupBy
Signed-off-by: Long Nguyen <olragon@gmail.com>
2020-03-31 16:01:39 +02:00
Alexandre Bodin
087920fb47 Merge branch 'develop' into features/media-lib
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-31 11:58:31 +02:00
Convly
67187c38f2 Rename _type to type and type to nonRequiredType
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
2020-03-30 16:45:00 +02:00
Convly
1103d96500 Rename noRequired to nonRequired
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
2020-03-30 16:45:00 +02:00
Convly
98b5b4a029 GraphQL Aggregation: Remove required marker when checking for number types (int/float)
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
2020-03-30 16:45:00 +02:00
Alexandre Bodin
50df7365d6 Merge branch 'develop' into features/media-lib
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-30 12:04:04 +02:00
Alexandre Bodin
24bd311678 v3.0.0-beta.19.4 2020-03-30 09:57:05 +02:00
Long Nguyen
77a5160d1a
Implement Graphql Aggregation Feature for Bookshelf (#5605)
* Implement Graphql Aggregation Feature for Bookshelf

Signed-off-by: Long Nguyen <olragon@gmail.com>

* Fix no-unused-vars

Signed-off-by: Long Nguyen <olragon@gmail.com>

* Fix code to use `model.get()` instead of internal structure

Signed-off-by: Long Nguyen <olragon@gmail.com>
2020-03-27 10:40:29 +01:00
soupette
818927f7b5 Fix conflicts
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-23 14:33:17 +01:00
Kim, Harim
40ea493b26
Fix context issue in custom GraphQL query and mutation (#5532)
* fix context issue in custom query and mutation

Signed-off-by: harimkims <harimkims@gmail.com>

* merge only state-related context

Signed-off-by: harimkims <harimkims@gmail.com>

* roll back the code, fix the test instead

Signed-off-by: harimkims <harimkims@gmail.com>
2020-03-20 14:24:14 +01:00
Alexandre Bodin
ed2b973b99 Merge branch 'develop' into features/media-lib 2020-03-20 11:04:10 +01:00
Jelmer Visser
7f3be5eb04 Return newObj instead of original object
Signed-off-by: Jelmer Visser <jelmer@weflycheap.nl>
2020-03-20 09:27:05 +01:00
Jelmer Visser
4bda9f3104 Leave custom resolvers alone when diff
Signed-off-by: Jelmer Visser <jelmer@weflycheap.nl>
2020-03-20 09:27:05 +01:00
Pierre Noël
c3f011ddba Merge branch 'master' into fix/#4556/nullWhenRequiringAComponentInRelationGraphQl
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
2020-03-16 15:49:59 +01:00
Pierre Noël
9990759dd5 always populate with components
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
2020-03-16 15:43:03 +01:00
Alexandre Bodin
243085dae1 Merge branch 'develop' into features/media-lib 2020-03-13 15:40:11 +01:00
Pierre Noël
1227bfeba4 add possibility to set a relation "private"
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
2020-03-13 12:23:11 +01:00
soupette
f3bcddcf89 Identify front-end core files
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-06 13:33:32 +01:00
soupette
bdc2758613 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-06 11:44:20 +01:00
soupette
8a8929e97c v3.0.0-beta.19.3 2020-03-06 10:02:36 +01:00
Alexandre Bodin
e1a7074a4e Merge branch 'develop' into features/media-lib 2020-03-05 14:39:29 +01:00
Alexandre Bodin
b3e18e1de6 v3.0.0-beta.19.2 2020-03-05 14:32:42 +01:00
soupette
f1de079d77 Fix conflicts
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-05 10:22:49 +01:00
Alexandre Bodin
8e91e5abaf v3.0.0-beta.19.1 2020-03-04 18:42:31 +01:00
soupette
d6bc4e1941 Fix conflicts
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-04 14:52:29 +01:00
Alexandre Bodin
e222792181 v3.0.0-beta.19 2020-03-04 14:24:23 +01:00
HichamELBSI
b5947621fc Merge branch 'master' into develop 2020-03-04 09:32:13 +01:00
Alexandre Bodin
7a8c865051 Merge branch 'develop' into features/media-lib
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-02 15:18:08 +01:00
soupette
3a695aeaac Merge branch 'develop' of github.com:strapi/strapi into chore/remove-saga-admin 2020-03-02 11:34:01 +01:00
soupette
ccc92b90a5 Add required info into the plugin object and update plugin generator
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-28 11:40:55 +01:00
Alexandre Bodin
3bcbde8f0b v3.0.0-beta.18.8 2020-02-26 12:01:37 +01:00
Alexandre Bodin
8a6c48eb14 Merge branch 'develop' into features/single-types 2020-02-13 11:36:07 +01:00
Alexandre Bodin
04f6050ae1 Cleanup feedbacks
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-02-11 17:35:09 +01:00