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
9,285 Commits 121 Branches 507 Tags
Commit Graph

308 Commits

Author SHA1 Message Date
Alexandre BODIN
b3648ba4d9
Merge branch 'master' into chore/routing-x-forwarded 2019-09-24 10:04:19 +02:00
Alexandre Bodin
bf7870de3b Merge branch 'master' of github.com:strapi/strapi into chore/routing-x-forwarded 2019-09-18 17:29:09 +02:00
Natalia Tsvetkova
a4a26be4b3 Merge branch 'master' into feature/instagram_provider 2019-09-18 14:36:18 +02:00
Alexandre Bodin
6c2d413ba0 Fix user-permissions graphql permissions and update user 2019-09-18 12:07:45 +02:00
Natalia Tsvetkova
92f00de254 Merge branch 'master' into feature/instagram_provider 2019-09-09 14:59:21 +02:00
Alexandre Bodin
a22f2cefef Remove x-forwarded-host. 
- set security defaults for development mode that are standard
- refactor error messages to work without ctx.request.admin
- remove mask middleware and add a sanitization layer to the core-api to
hide private fileds
 2019-09-06 14:33:24 +02:00
Natalia Tsvetkova
6a3409891c Added instagram social auth provider 2019-09-06 09:19:23 +02:00
Alexandre Bodin
2a780ea10a Clear _id now that queries return an id everytime 2019-08-13 17:40:31 +02:00
Alexandre Bodin
3b47457f4f make boostrap functions async only 2019-08-12 15:35:40 +02:00
Alexandre Bodin
04d4b60056 Merge branch 'master' into develop 2019-07-25 15:05:07 +02:00
Alexandre Bodin
48e45c5e01 Cleanup layout.js files 2019-07-23 13:45:08 +02:00
Derrick Mehaffy
2f44b7353b
PR Feedback for testing 2019-07-23 02:20:36 -07:00
Derrick Mehaffy
8bcc6d5d37
Fix graphql me route when using bookshelf databases 2019-07-19 02:14:46 -07:00
Alexandre Bodin
c020f0a6cd mongoose working version 2019-07-17 00:03:38 +02:00
Alexandre Bodin
09dcea27f1 refactor mongoose queries to match api 2019-07-16 21:24:09 +02:00
Alexandre Bodin
1658b48aa0 Refactor users-permissions to use the new strapi.query 2019-07-16 17:23:38 +02:00
Louis Augry
a3fe9d5a38 Fix documention typo 2019-07-08 15:10:17 +02:00
Alexandre Bodin
754acd0280 Fix user routes using _id instead of id 
- Add database.js and DB env to example app to test on different dbs
quickly
 2019-06-18 18:33:53 +02:00
Alexandre Bodin
2b3c8d6628 Fix permission policy mixing users jwt and admin jwt 2019-06-07 15:44:06 +02:00
Alexandre Bodin
a41641bfe4 Add a queries interface to the plugins 2019-04-26 13:40:23 +02:00
Alexandre Bodin
ab0fa1f5de Init build bin 2019-04-26 13:40:16 +02:00
Alexandre Bodin
87857b94be Implement strapi.queries for all models 2019-04-16 09:05:46 +02:00
Alexandre Bodin
eb7c4534f8 Exports schema.graphql in devmode, load extensions folder and run merge config and overwrites 2019-04-16 09:00:24 +02:00
Alexandre Bodin
9e9ff9907d Refactor strapi load 2019-04-16 08:50:22 +02:00
soupette
a2192c1dec Fix conflicts 2019-04-09 16:01:01 +02:00
soupette
e56e46e030 Split admin and users. 
Co-authored-by: lauriejim
 2019-04-09 12:09:03 +02:00
Alexandre Bodin
3098309369 Use mongoose.find on simple queries for a perf boost 2019-03-26 14:57:02 +01:00
Alexandre Bodin
d2db6b633f Mongo + graphql v1 2019-03-21 09:07:36 +01:00
Kamal Bennani
e8c92fc3d7 Adapt Services to the new Mongoose API 2019-03-21 09:06:06 +01:00
Kamal Bennani
c93311557e Adapt Services to the new Bookshelf API 2019-03-21 09:05:42 +01:00
Jim LAURIE
720bb53858
Merge branch 'master' into fix/users-count-role-sql 2019-03-02 13:48:53 +01:00
Jim LAURIE
cca2ea98dc Fix user count per role on SQL database 2019-03-01 10:52:52 +01:00
EpicUsaMan
32361e2949
Fix for SQLite 2019-02-28 19:22:01 +02:00
Sajjad Shirazy
a9606b6eae Supporintg IN and NOT IN as a filter type 2019-02-03 15:08:36 +03:30
Aurélien Georget
2115124931 Remove Mongoose warning logs 2019-01-23 16:56:04 +01:00
Jim LAURIE
f90255bb75
Merge branch 'master' into issue/2327 2019-01-22 13:52:13 +01:00
Aurélien Georget
b501e8bb1b Resolve conflicts 2019-01-05 20:33:47 +01:00
soupette
2ab9be48ee Fixes #2555 2019-01-03 17:24:06 +01:00
Jim LAURIE
f87ebea759
Merge branch 'master' into plugin-documentation 2018-12-17 16:22:03 +01:00
Jim LAURIE
596d4dd791
Merge branch 'master' into add-cypress 2018-12-12 20:18:57 +01:00
soupette
43966b8416 Fix conflicts 2018-12-12 14:25:44 +01:00
DMehaffy
fb845792ab Fix to allow provider to be shown in the content manager 2018-12-11 17:40:57 +01:00
soupette
27df580edb Merge branch 'master' of github.com:strapi/strapi into add-cypress 2018-12-11 12:12:53 +01:00
Aurélien Georget
e1ce257d2f Revert codebase and apply limit, skip, start and sort parameters 2018-12-06 18:11:53 +01:00
soupette
0916c4e018 Fix conflicts 2018-12-06 16:39:20 +01:00
Jim LAURIE
03c1e04d87 Revert filter PR 2018-12-04 17:05:03 +01:00
soupette
d60b5c5b34 Fix conflicts 2018-11-27 20:22:41 +01:00
Aurélien Georget
b0aaae9f12 Resolve conflicts 2018-11-27 18:48:37 +01:00
Jim LAURIE
00d6284552 Fix fetch user mongoose 2018-11-27 16:44:20 +01:00
Aurélien Georget
540e1bccf8 Allow private attribute into input definition 2018-11-27 14:59:28 +01:00