yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-26 22:54:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,408 Commits 138 Branches 514 Tags
Commit Graph

2408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cyril lopez
b541e6cc4f Fix conflict 2017-12-13 16:47:35 +01:00
cyril lopez
1ef46dffea Get plugins models and adapt from to display plugins models 2017-12-13 16:41:49 +01:00
Aurelsicoko
859e2985c8 Fix many-to-many association with Bookshelf 2017-12-13 16:28:50 +01:00
Aurelsicoko
cbd1da155b Fix many-to-one association with Bookshelf 2017-12-13 15:30:03 +01:00
cyril lopez
c6d74d58f0 Add plugins models to ctb and fix navigation 2017-12-13 15:22:16 +01:00
Aurelsicoko
74e1f0529d Fix specific case in one-to-one relation 2017-12-13 14:36:07 +01:00
Aurelsicoko
1127ab1c85 Fix one-to-one during first creation with Bookshelf 2017-12-13 12:14:15 +01:00
Aurelsicoko
b08a4d811c Use local global to expose model for Bookshelf & move globalId definition in the core 2017-12-13 11:38:38 +01:00
Aurelsicoko
a47d99efd4 Display ID for SQL databases 2017-12-12 16:27:29 +01:00
Aurelsicoko
61d75648b0 Fix content-manager offset for SQL databases 2017-12-12 16:24:19 +01:00
Aurelsicoko
628ad4add4 Fix strapi-bookshelf to work w/ associations w/ plugins & JWT condition 2017-12-12 16:14:38 +01:00
Aurelsicoko
8db92c22fd Split Content-Manager logic into service & allow CRUD and associations w/ plugin's models w/ Mongoose 2017-12-11 18:23:15 +01:00
Aurelsicoko
d53287362a Fix source parameters to switch between content-type 2017-12-11 14:18:40 +01:00
Aurelsicoko
bf8b434f4b Allow relation with plugin's models 2017-12-11 12:29:05 +01:00
Aurelsicoko
88fb2ee89c Fix default middleware configurations & allowed headers 2017-12-11 12:26:16 +01:00
cyril lopez
3da6faac05 Fix feedback PR 2017-12-08 14:40:42 +01:00
Jim Laurie
b4cae064d5 Fix conflict 2017-12-08 12:30:10 +01:00
Jim Laurie
f0393d37b6 Add documentation 2017-12-08 12:27:48 +01:00
cyril lopez
1d64d827be Add roles key to permissions 2017-12-08 12:03:37 +01:00
cyril lopez
5ca95aac74 Remove plugins.json 2017-12-08 11:24:12 +01:00
cyril lopez
96506e5643 Fix middleware usp .policies of undefined 2017-12-08 11:21:51 +01:00
Jim LAURIE
80be255f4b
Delete plugins.json file 2017-12-08 10:50:45 +01:00
cyril lopez
247c02fd43 Update branch 
Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions
 2017-12-08 10:48:26 +01:00
cyril lopez
4074846b5b Refacto service 2017-12-08 10:42:45 +01:00
Aurelsicoko
bbde1dc125 Resolve conflicts 2017-12-07 19:15:24 +01:00
Aurelsicoko
f9cc9b504c Delay admin load and handle relation between plugin and main models 2017-12-07 19:12:20 +01:00
cyril lopez
3ebd86b2e1 Update branch 
Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions
 2017-12-07 18:42:40 +01:00
cyril lopez
f471a98f90 Fix manage user role bookshelf 2017-12-07 18:40:55 +01:00
cyril lopez
8d6cace469 Refacto InputSearch 2017-12-07 18:31:19 +01:00
Jim Laurie
729eea32c7 Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions 2017-12-07 18:31:16 +01:00
cyril lopez
b01abf91f1 Add apiRoutes and fix feedback PR 2017-12-07 18:16:18 +01:00
Jim Laurie
5b4f91dcff Fix some PR feedback 2017-12-07 18:16:15 +01:00
Jim Laurie
eec1dcff84 Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions 2017-12-07 17:26:05 +01:00
Jim Laurie
b7712cf512 Fix conflicts 2017-12-07 17:04:24 +01:00
cyril lopez
4d15c74a21 Fix feedback PR 2017-12-07 16:53:30 +01:00
Jim LAURIE
015405df0d
Delete plugins.json file admin 2017-12-07 16:31:44 +01:00
Aurelsicoko
9409a39fc8 Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions 2017-12-07 16:23:59 +01:00
Jim Laurie
ad15fbd8ad Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions 2017-12-07 16:16:58 +01:00
Jim Laurie
8ed108c012 Add filter fetch content type builder queries 2017-12-07 15:44:20 +01:00
cyril lopez
957b92692a Sort functions by name 2017-12-07 15:27:11 +01:00
cyril lopez
cba9cac629 Delete useless request file in ctm and order Auth controller by function s name 2017-12-07 15:21:54 +01:00
Jim Laurie
cbc0cf73dd Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions 2017-12-07 14:57:45 +01:00
Jim Laurie
3f15a5b618 Fix bookshelf fetch for auth 2017-12-07 14:56:25 +01:00
Aurelsicoko
f5023b2fdc Use private data instead of state to send source to actions in Content Manager 2017-12-07 14:37:09 +01:00
cyril lopez
f3184590d7 Fix typo 2017-12-07 14:35:35 +01:00
Aurelsicoko
94c153dd5f Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions 2017-12-07 14:31:13 +01:00
Aurelsicoko
3056736ca9 Use get default value in LeftMenuLinkContainer 2017-12-07 14:30:31 +01:00
Aurelsicoko
6f0396ea04 Remove unnecessary backend url from sagas' urls 2017-12-07 14:28:55 +01:00
cyril lopez
ce94f85a50 Update branch 
Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions
 2017-12-07 14:17:23 +01:00
cyril lopez
592a7cb58c Fix request helper 2017-12-07 14:16:21 +01:00