yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-18 05:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,691 Commits 117 Branches 489 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim LAURIE
d3a82618b3
Merge pull request #928 from Froelund/patch-2 
Fixed issue for connection settings and ssl prop
 2018-04-12 15:48:21 +02:00
Aurelsicoko
73764d6ae0 Add containss in Bookshelf filters 2018-04-12 15:44:04 +02:00
Jim LAURIE
1cf906547f
Merge branch 'master' into patch-2 2018-04-12 15:30:03 +02:00
Jim LAURIE
f896d94424
Merge pull request #831 from strapi/wysiwyg-preview-fullscreen 
Wysiwyg
 2018-04-12 15:27:07 +02:00
Jørgensen
f5a0bce148
Update index.js 
Updated according to comments.
 2018-04-12 15:23:03 +02:00
Jim LAURIE
6e843dad3e
Merge branch 'master' into wysiwyg-preview-fullscreen 2018-04-12 15:02:13 +02:00
Aurelsicoko
815f896ba8 Remove logs and clean code 2018-04-12 14:42:31 +02:00
Jim Laurie
bb114a592d Clean model 2018-04-12 14:19:22 +02:00
Jim LAURIE
be2162eaa4
Merge pull request #929 from Jan10/master 
Update german translations
 2018-04-12 12:02:29 +02:00
soupette
37c976d495 WYSIWYG is ready 2018-04-12 09:49:29 +02:00
soupette
57e34cf994 Allow to add <a><img /><a> 2018-04-11 22:39:30 +02:00
soupette
54fc51592b Need to identify add ul bug 2018-04-11 22:13:43 +02:00
Jan Brachhold
d986055fb8 Update german translations 2018-04-11 21:19:31 +02:00
Jim LAURIE
c15d166685
Merge pull request #892 from TheWebsDoor/ISSUE-825 
Losing OneToOne relation in the content manager
 2018-04-11 19:56:35 +02:00
soupette
cdc92607d6 Handle img links!!!!!!!! 2018-04-11 19:36:08 +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
534a1099ac Update CSS WYSIWYG 2018-04-11 15:08:20 +02:00
Jørgensen
b64ad9524f
Fixed issue for connection settings and ssl prop 2018-04-11 14:40:05 +02:00
Aurelsicoko
17c46b331d Make GraphQL polymorphic relationships working with Bookshelf 2018-04-11 12:53:07 +02:00
soupette
d31d82ab1f Fix conflicts 2018-04-11 12:45:21 +02:00
soupette
9c0cde3489 Add comments 2018-04-11 12:40:29 +02:00
Jim LAURIE
9fa9eb42ed
Merge pull request #903 from strapi/new-dashboard 
New dashboard
 2018-04-11 12:28:21 +02:00
Jim LAURIE
eed50f0c70
Merge branch 'master' into new-dashboard 2018-04-11 11:23:53 +02:00
Jim LAURIE
3f2a76d771
Merge pull request #906 from strapi/update-mkt 
Update installpluginpage design
 2018-04-11 11:22:37 +02:00
Aurelsicoko
c59ad9d958 Support findOne request 2018-04-10 19:02:21 +02:00
Aurelsicoko
78234fab61 Support contains sensitive filter and fix Bookshelf queries 2018-04-10 18:54:01 +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
b6ef82be83 Update generated controller to make them compatible with GraphQL 2018-04-10 12:26:44 +02:00
Aurelsicoko
69714842a3 Update GraphQL documentation and fix context request 2018-04-10 12:22:51 +02:00
Aurelsicoko
3daf7523c8 Apply policy for each query and use generated API business logic 2018-04-10 11:47:01 +02:00
soupette
81109f558e Fix conflict 2018-04-10 11:18:04 +02:00
soupette
58908c9ad3 Fix height 2018-04-10 11:17:37 +02:00
Jim LAURIE
6934661845
Merge pull request #918 from lucaperret/feat/findOne-upload 
Add find one file endpoint
 2018-04-10 10:24:52 +02:00
soupette
b8456dc779 Add usefull comment 2018-04-10 10:16:37 +02:00
soupette
0010e27442 Fix wysiwyg height 2018-04-10 10:13:16 +02:00
Luca Perret
19f0494650 feat(plugin-upload): adding findOne endpoint 2018-04-09 19:31:49 +02:00
soupette
68c3c290b0 Add prettier 2018-04-09 16:47:31 +02:00
soupette
34e5ca8010 Add shouldComponent to Wysiwyg 2018-04-09 16:41:34 +02:00
soupette
9e9353cba4 Fix count number on delete 2018-04-09 15:58:22 +02:00
soupette
c562c79430 Fix lag in preview 2018-04-09 15:52:58 +02:00
soupette
07e61236b1 Fix ol cursor offset 2018-04-09 10:58:01 +02:00
soupette
6b0a37cdb3 Remove focus border and open link in a new tab 2018-04-09 10:29:33 +02:00
Jim LAURIE
648bf52a3c
Merge pull request #912 from strapi/enhance/defaults 
Handle default values with Bookshelf
 2018-04-08 16:38:29 +02:00
Jim LAURIE
ec3a774e8a
Merge branch 'master' into enhance/defaults 2018-04-08 16:12:02 +02:00
Jim LAURIE
6ed30c7ba0
Merge pull request #910 from Jan10/master 
Improve german translations
 2018-04-08 16:08:50 +02:00
soupette
0c1a1f92b4 Fix conflicts 2018-04-06 17:52:24 +02:00
soupette
b84e68ff87 Fix typos 2018-04-06 17:50:53 +02:00