yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 02:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,922 Commits 121 Branches 507 Tags
Commit Graph

11922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Virginie Ky
a5718f9eb7 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 2020-03-27 09:44:49 +01:00
soupette
56349bef71 Merge branch 'master' of github.com:strapi/strapi into develop 2020-03-27 07:46:47 +01:00
Alexandre BODIN
9fdb650c6c
Fix rerouting of destroy route in user-perm (#5581) 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-26 13:55:52 +01:00
Paul Jordaan
5423c14728
Remove condition that reset query start param (#5557) 
Every time the menu got closed the start condition for the query would get reset to  0. Expected behavior would be to load the next set of results.

Signed-off-by: Paul <paul@flow.rent>
 2020-03-26 12:14:45 +01:00
Alexandre BODIN
8aafa1b53a
Merge pull request #5607 from strapi/fix/#5190/badSingularFormOfColumnNameInQuery 
Fix bad singular form of column name
 2020-03-26 11:47:37 +01:00
Pierre Noël
af1636b301 fix bad singular form of column name 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-26 11:21:17 +01:00
soupette
45b7f7af5f Merge branch 'master' of github.com:strapi/strapi into develop 2020-03-26 08:00:50 +01:00
Pierre Noël
a63c692fca
don't generate default routes when generating plugin api (#5586) 
* don't generate default routes when generating plugin api

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

* remove console log

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

Co-authored-by: Pierre Noël <pierre.noel@strapi.io>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-03-25 09:31:21 +01:00
Alexandre BODIN
44d77d8063
Merge pull request #5580 from roelbeerens/feature/missing-auth-mutations 
Added missing forgotPassword, changePassword and emailConfirmation mutations/resolvers
 2020-03-24 18:22:40 +01:00
Alexandre BODIN
b15db81adb
Merge branch 'master' into feature/missing-auth-mutations 2020-03-24 18:22:17 +01:00
Alexandre BODIN
562b030025
Merge pull request #5584 from joshwnj/fix-default-from-address 
Fix the order of settings in ses provider
 2020-03-24 11:21:46 +01:00
Josh Johnston
b7fd5f28fd Fix the order of settings in ses provider 
Why:

- because there is a default hardcoded value in options.from, the
custom value would never be used.

Signed-off-by: Josh Johnston <josh@x-team.com>
 2020-03-24 19:43:13 +11:00
Alexandre Bodin
e49caedd8e Merge branch 'master' into develop 2020-03-24 09:40:08 +01:00
Alexandre BODIN
c55c94c7dd
Merge pull request #5547 from strapi/fix/#3889/wrongPathGenerateModelInPlugin 
fix generate:model --plugin path + little refacto of code
 2020-03-23 19:02:28 +01:00
Alexandre BODIN
ea77e6c8f9
Merge branch 'master' into fix/#3889/wrongPathGenerateModelInPlugin 2020-03-23 18:05:28 +01:00
Roel Beerens
2570e27238 feat: Added missing forgotPassword, changePassword and emailConfirmation mutations/resolvers. Made a slight adjustment to the emailConfirmation controller function in Auth.js to return a UsersPermissionsLoginPayload when using GraphQL 
Signed-off-by: Roel Beerens <roel@gravity.nl>
 2020-03-23 18:02:26 +01:00
Alexandre BODIN
ce7db06ac9
Merge pull request #5578 from diogotcorreia/fix/#5577 
Make UID searchable in Mongoose and avoid errors if content type can't be searched
 2020-03-23 17:40:50 +01:00
Alexandre Bodin
ab9f7d0207 Merge branch 'master' into develop 2020-03-23 17:28:09 +01:00
Diogo Correia
400893fd6a Prevent error when content type doesn't have searchable fields 
Signed-off-by: Diogo Correia <me@diogotc.com>
 2020-03-23 14:36:58 +00:00
Diogo Correia
684c65ab2e Add 'UID' field search to Mongoose 
Signed-off-by: Diogo Correia <me@diogotc.com>
 2020-03-23 14:36:58 +00:00
Alexandre BODIN
826bb8a9f4
Merge pull request #5576 from strapi/fix/removeConsole4xx 
Remove extra logs in users-permissions
 2020-03-23 14:29:52 +01:00
soupette
18772c98b8 Merge branch 'master' of github.com:strapi/strapi into develop 2020-03-23 14:19:34 +01:00
Alexandre BODIN
3e4c9d95d0
Merge pull request #5536 from strapi/fix/#4487/filteringDataManyWayError500 
Fix deep filtering for manyWay
 2020-03-23 14:03:12 +01:00
Pierre Noël
39648047a7 Merge branch 'master' into fix/#4487/filteringDataManyWayError500 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-23 12:01:20 +01:00
Pierre Noël
0c7029c2b1 lint 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-23 12:00:13 +01:00
Derrick Mehaffy
8f7af83049
Remove extra console.log in users-permissions 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-23 03:50:35 -07:00
Pierre Noël
74625b0ec7 remove strapi-utils from front + remove use of idPluralized 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-23 11:28:07 +01:00
Pierre Noël
be6517c02d refacto strapi-generate-* + move nameToSlug to strapi-utils 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-23 10:42:34 +01:00
Virginie Ky
c69a84f91a Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-23 08:34:34 +01:00
Virginie Ky
88b99ffe48 Merge branch 'front/ui-improvements' of github.com:strapi/strapi into front/ui-improvements 2020-03-23 08:32:52 +01:00
Loren
88de1fa692
Fixed sentence structure and grammatical errors. (#5507) 
* Fixed sentence structure and grammatical errors.

Signed-off-by: C-Climb <deathmarchtepes@gmail.com>

* Fixed additional grammatical mistakes.

Signed-off-by: C-Climb <deathmarchtepes@gmail.com>

* Fixed additional grammatical mistakes

Signed-off-by: C-Climb <deathmarchtepes@gmail.com>

* Updated plugin link to point to beta 3.0.0 docs.

Signed-off-by: C-Climb <deathmarchtepes@gmail.com>
 2020-03-22 18:30:31 +01:00
Michael-Scott-PC
e56fa01c1c
Documentation improvements 2020-03-22 18:28:03 +01:00
virginieky
b4fb4829fc
Merge pull request #5551 from strapi/front/ui-fixes 
Some UI fixes
 2020-03-20 18:16:44 +01:00
Mattias van den Belt
f8023cc66c
Update Dutch Translation and Typos [NL] (#5523) 
* Update Dutch Translation

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Add new translation keys

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update strapi-admin translation [NL]

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Sort translation [NL]

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update dutch content-types translations

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

Co-authored-by: Nikolay Tyurin <kolya_tyurin@mail.ru>
 2020-03-20 17:10:55 +01:00
Pierre Noël
ff1fbcdfba small refacto 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-20 16:44:25 +01:00
Virginie Ky
59c567aa3c clean numberOfVisibleItems prop 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-20 16:40:55 +01:00
Virginie Ky
8d52924783 apply design review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-20 15:09:06 +01:00
nikolasmelui
a74239c19c
Fix syntax error (#5516) 2020-03-20 14:45:47 +01:00
Virginie Ky
df1e81d317 Merge branch 'front/ui-fixes' of github.com:strapi/strapi into front/ui-fixes 2020-03-20 14:41:47 +01:00
Virginie Ky
541cd72e97 Admin leftmenu bullet icon 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-20 14:40:56 +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
virginieky
4392eaff7e
Merge branch 'develop' into front/ui-fixes 2020-03-20 14:05:40 +01:00
Ralph
dae9cfa415
Make plugins documentation generation optional (#5465) 
* Make plugins documentation generation optional

Signed-off-by: Ralph Maroun <rmaroun@outlook.com>

* Removing "-" character from schema names for generated plugin documentation so it becomes compatible with AWS API gateway import API feature using OAS file. Adding only one property to the settings file pluginsForWhichToGenerateDoc so that the user can choose for which plugin he wishes to generate documentation. Adding a parameter to generate or not the default response (this can now be set to false to have a documentation that is compatible with AWS API Gateway).

Signed-off-by: Ralph Maroun <rmaroun@outlook.com>

* Updating settings.json to start without the pluginsForWhichToGenerateDoc key so that all plugins documentation gets generated by default. Updated the documentation to reflect this change.

Signed-off-by: Ralph Maroun <rmaroun@outlook.com>

* Updating documentation to correct typos and rephrase some sentences to make them more clear.

Signed-off-by: Ralph Maroun <rmaroun@outlook.com>

* Destructuring the config to the var pluginsForWhichToGenerateDoc instead of renaming it to take into account comment from Alexandre Bodin

Signed-off-by: Ralph Maroun <rmaroun@outlook.com>

* Destructuring generateDefaultResponse and pluginsForWhichToGenerateDoc from strapi config object based on feedback from Alexandre Bodin

Signed-off-by: Ralph Maroun <rmaroun@outlook.com>

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-03-20 14:03:51 +01:00
Dacre Denny
45d83ea3f5
Removed unused 'cb' callback on send method of Email service and Email providers (#5371) 
Signed-off-by: dacre-denny <dacre@mooce.co.nz>
 2020-03-20 14:02:47 +01:00
Pierre Noël
5ffe33c530 fix manyWay deep filtering when the relation is self 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-20 13:18:51 +01:00
Virginie Ky
dc12ab9905 Merge branch 'front/ui-fixes' of github.com:strapi/strapi into front/ui-fixes 2020-03-20 10:09:52 +01:00
Virginie Ky
12116c149b update snapshots 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-20 10:09:32 +01:00
virginieky
163db4db32
Merge branch 'develop' into front/ui-fixes 2020-03-20 09:38:18 +01:00
Virginie Ky
6ac715abf7 leftmenu dropdown alignment 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-20 09:36:53 +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