yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-08 08:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,877 Commits 113 Branches 488 Tags
Commit Graph

975 Commits

Author SHA1 Message Date
Aurelsicoko
0f581fa5c3 Be able to retrieve polymorphic association using GraphQL (File Upload) 2018-04-05 15:20:24 +02:00
Jim Laurie
ee12536e84 3.0.0-alpha.11.3 2018-04-05 14:13:50 +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
920ced6ce7 Resolve conflicts 2018-04-02 16:40:40 +02:00
Jim LAURIE
b9eea87885
Merge branch 'master' into ctb-default-value 2018-04-02 11:27:56 +02:00
soupette
7d718c9627 Add react-loadable and fix wysiwyg css 2018-04-02 11:18:05 +02:00
soupette
86bc73e9d1 Fix conflict 2018-04-02 09:50:58 +02:00
Aurelsicoko
74ad7ffa0c Handle relationship in GraphQL query 2018-03-31 18:55:08 +02:00
Inder Redni
1e914be7b7 polish language | update 2018-03-30 19:00:06 +02:00
soupette
0c8769138c Fix conflict 2018-03-30 13:00:03 +02:00
Jim Laurie
8390106f59 3.0.0-alpha.11.2 2018-03-27 17:59:16 +02:00
cyril lopez
37eedd5747 Fix pagination 2018-03-27 10:27:50 +02:00
cyril lopez
b1e39929de Fixes #850 2018-03-27 10:13:13 +02:00
cyril lopez
f6c0061334 Allow default values for attributes 2018-03-26 15:25:32 +02:00
cyril lopez
4704d0c004 Add default value when creating a record in ctm 2018-03-26 12:31:48 +02:00
cyril lopez
8be6df24b3 Fix PR feedback 2018-03-23 17:11:10 +01:00
cyril lopez
f0298b1566 Remove old layout 2018-03-20 16:20:50 +01:00
cyril lopez
0952c9aaa9 Add new layout dynamic 2018-03-19 12:30:04 +01:00
cyril lopez
67cb54ae12 Add request to fetch layout in ctm 2018-03-19 11:57:47 +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
e1b727ee09 Write appearance in layout.json file 2018-03-14 16:24:11 +01:00
Jim Laurie
169c9742bb Merge branch 'wysiwyg' of github.com:strapi/strapi into wysiwyg 2018-03-14 15:10:35 +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
1d0ef6062e Merge branch 'master' of github.com:strapi/strapi into wysiwyg 2018-03-13 10:16:36 +01:00
cyril lopez
03195550aa Fix edit user 2018-03-13 09:28:17 +01:00
cyril lopez
1187605c2a
Remove comments 2018-03-12 13:30:41 +01:00
cyril lopez
a474d8d389 Fix ctm layout bug 2018-03-12 12:45:00 +01:00
Jim Laurie
6cd0ec730e 3.0.0-alpha.11.1 2018-03-11 15:54:56 +01:00
cyril lopez
82b779aa6f Fix conflict and start fixineg eslint on helper plugin 2018-03-09 16:41:24 +01:00
Jim Laurie
932bf6da23 3.0.0-alpha.11 2018-03-08 17:31:25 +01:00
Jim Laurie
117d9534c9 Remove logs 2018-03-08 10:11:06 +01:00
Aurelsicoko
df4f02c303 Lower ref parameter to retrieve globalId 2018-03-07 14:59:41 +01:00
Aurelsicoko
800945eb32 Resolve conflicts 2018-03-06 15:50:41 +01:00
cyril lopez
e4e65658e6 Add animation when uploading files 2018-03-06 14:02:56 +01:00
cyril lopez
627e241c94 Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload 2018-03-06 09:33:12 +01:00
cyril lopez
3e32741114 Add loading button to ctm and to upload && modify design 2018-03-06 09:31:44 +01:00
Aurelsicoko
670f1d8434 Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload 2018-03-05 18:40:57 +01:00
Jim Laurie
be7e95b48c Add createdAt updatedAt for mongoose 2018-03-05 17:26:55 +01:00
Aurelsicoko
2f69111506 Merge branch 'master' of github.com:strapi/strapi into feature/upload 2018-03-05 16:23:17 +01:00