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

101 Commits

Author SHA1 Message Date
Aurelsicoko
87b07c8eeb Resolve conflicts 2018-04-13 18:04:03 +02:00
soupette
795993a9b6 Empty ctm layout.json 2018-04-13 15:14:11 +02:00
soupette
f7cbfbf1db Merge branch 'graphql' of github.com:strapi/strapi into graphql 2018-04-13 14:44:25 +02:00
soupette
a66ca698ee Fix hook bug and remove useless admin containers 2018-04-13 14:37:46 +02:00
Aurelsicoko
aaac5ba391 Clean code 2018-04-13 14:27:50 +02:00
Jim LAURIE
950122dbdb
Merge branch 'master' into poly-cm 2018-04-12 17:58:51 +02:00
Aurelsicoko
0ac7c435f3 Merge branch 'master' of github.com:strapi/strapi into graphql 2018-04-12 16:37:23 +02:00
Aurelsicoko
73764d6ae0 Add containss in Bookshelf filters 2018-04-12 15:44:04 +02:00
Jim LAURIE
6e843dad3e
Merge branch 'master' into wysiwyg-preview-fullscreen 2018-04-12 15:02:13 +02:00
Jim LAURIE
80922afd79
Merge branch 'master' into ISSUE-825 2018-04-11 18:52:27 +02:00
Adrien Lepoutre
2496611fca Code cleaning 2018-04-11 10:09:53 -04:00
Aurelsicoko
17c46b331d Make GraphQL polymorphic relationships working with Bookshelf 2018-04-11 12:53:07 +02:00
Aurelsicoko
cd43c2851b Build schema.graphql to query Users & Permissions models 2018-04-10 15:54:34 +02:00
Jim Laurie
bdd1583543 Handle polymorphic in admin 
Only for collection: * poly side
 2018-04-10 14:46:36 +02:00
Aurelsicoko
26be155f09 Await promises before returning values 2018-04-10 12:56:13 +02:00
Aurelsicoko
0f581fa5c3 Be able to retrieve polymorphic association using GraphQL (File Upload) 2018-04-05 15:20:24 +02:00
soupette
ff4253aeea Fix conflict and fix focus bug in WYSIWYG 2018-04-04 17:51:41 +02:00
Jim Laurie
43d6a9af9c Hotfix params bookshelf filters again :/ 2018-04-03 18:12:20 +02:00
Jim Laurie
cd8fd85f12 Hotfix params bookshelf filters 2018-04-03 17:04:10 +02:00
Jim Laurie
5948e9fa5c Update content manager filter 2018-04-03 13:03:41 +02:00
Aurelsicoko
66b75801c7 Add contains query and be able to disabled specific query 2018-04-03 11:30:39 +02:00
Adrien Lepoutre
0b0ea75402 ISSUE 825 - Losing OneToOne relation in the content manager - Fixes #825 2018-04-02 17:50:03 -04:00
Aurelsicoko
e917c61b02 Optimize GraphQL query with Bookshelf 2018-04-02 19:24:36 +02:00
Aurelsicoko
74ad7ffa0c Handle relationship in GraphQL query 2018-03-31 18:55:08 +02:00
cyril lopez
f0298b1566 Remove old layout 2018-03-20 16:20:50 +01:00
cyril lopez
63575565b1 Merge branch 'master' of github.com:strapi/strapi into wysiwyg 2018-03-15 22:20:54 +01:00
Jim LAURIE
a97e96c240
Merge branch 'master' into fix/mask 2018-03-15 16:21:05 +01:00
Aurelsicoko
684a70c665 Fix dominant true when updating relationship 2018-03-15 12:56:21 +01:00
Jim Laurie
54af44901b Remove useless clone object 2018-03-15 12:01:10 +01:00
Jim Laurie
2f4635bf4c Fix PR feedback 2018-03-15 11:51:40 +01:00
Jim Laurie
b4be337249 Route to get layout to apply 2018-03-14 10:22:15 +01:00
Jim Laurie
3c1ec20155 Fix form data update user 2018-03-13 15:57:41 +01:00
cyril lopez
82b779aa6f Fix conflict and start fixineg eslint on helper plugin 2018-03-09 16:41:24 +01:00
Aurelsicoko
df4f02c303 Lower ref parameter to retrieve globalId 2018-03-07 14:59:41 +01:00
Aurelsicoko
7dfc184a2e Don't loose oneToManyMorph relationship on update 2018-03-05 15:04:10 +01:00
cyril lopez
3e468a1b9c Wysiwyg is coming 2018-03-05 14:30:28 +01:00
Aurelsicoko
933254f1d1 Replace null by empty array on single file field 2018-03-02 17:00:00 +01:00
Aurelsicoko
2bdf226490 Add/remove one file in Content Manager for Bookshelf 2018-03-02 16:31:32 +01:00
Aurelsicoko
1490e06003 Remove useless association login in create method for Mongoose 2018-03-02 12:32:35 +01:00
Aurelsicoko
2d5f607052 Add/remove single file from Content Manager 2018-03-02 12:01:18 +01:00
Aurelsicoko
234d913c1b Add/remove images file Content Manager for SQL databases 2018-03-01 17:39:31 +01:00
Aurelsicoko
cde39a8609 Add/remove file from Content-Manager & move logic into the Upload plugin 2018-02-28 15:49:28 +01:00
Aurelsicoko
19b1574f00 Start to handle polymorphic association update in Content Manager (mongoose only) 2018-02-28 12:33:32 +01:00
Aurelsicoko
cfef18ea6b Remove relationship where a file is removed 2018-02-27 18:57:28 +01:00
Aurelsicoko
dac8931676 Handle association on upload route 2018-02-27 16:53:06 +01:00
Aurelsicoko
ab108a6f93 Create & handle association between File upload and others models 2018-02-27 11:52:18 +01:00
Aurelsicoko
8a66873405 Display better error message & lock fields 2018-01-25 18:12:29 +01:00
Aurelsicoko
8f85d85349 Improve roles in database to work with Bookshelf 2018-01-23 18:54:17 +01:00
Aurelsicoko
187f6cb748 Display logs for every missing tables or attributes & update delete/add role feature 2018-01-23 15:38:43 +01:00
Aurelsicoko
10db375825 Fix #379 - Support one-way relationship 2018-01-08 12:10:48 +01:00