yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-19 06:08:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,041 Commits 118 Branches 489 Tags
Commit Graph

5041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Salem
3075a9a70b
Create ar.json 2018-05-31 01:02:39 +03:00
soupette
b139a183f5 Improve anim 2018-05-30 16:37:49 +02:00
Jim Laurie
d2fd1204e4 Convert 1/0 to true/false for mysql fix #1203 2018-05-30 15:13:04 +02:00
Aurelsicoko
656c6d3463 Merge branch 'content-manager-filters' of github.com:strapi/strapi into content-manager-filters 2018-05-30 14:24:16 +02:00
Aurelsicoko
b83c8370f2 Enhance design filters 2018-05-30 14:19:36 +02:00
Jim Laurie
480f69c36f Fix cors on option request fix #914 2018-05-30 14:06:19 +02:00
soupette
6a720481b6 Fix anim 2018-05-30 13:59:49 +02:00
Jim LAURIE
bae8073c7b
Merge pull request #1181 from raulriera/additional-variables-mongoose 
Support for passing additional variables into mongoose
 2018-05-30 10:41:11 +02:00
Jim LAURIE
916c683e8d
Merge branch 'master' into additional-variables-mongoose 2018-05-30 10:02:50 +02:00
Jim LAURIE
f1a947eeaa
Merge pull request #1294 from johannpinson/patch-5 
Fix toJSON verification inside bookshelf for content-manager
 2018-05-30 10:02:10 +02:00
Raul Riera
156ed25265
Merge branch 'master' into additional-variables-mongoose 2018-05-29 16:28:22 -04:00
Jim LAURIE
70baca0a14
Merge branch 'master' into patch-5 2018-05-29 21:58:45 +02:00
Jim LAURIE
df324801e5
Merge pull request #1275 from strapi/fix/graphql 
Improve GraphQL query support
 2018-05-29 21:58:11 +02:00
Jim LAURIE
9a6d4330c1
Merge branch 'master' into additional-variables-mongoose 2018-05-29 21:27:18 +02:00
Jim LAURIE
aee7157d5a
Merge branch 'master' into fix/graphql 2018-05-29 21:09:57 +02:00
Jim Laurie
fbfdbf4812 Add oneToOne tests 2018-05-29 18:22:02 +02:00
soupette
dfa8c8e4b3 Empty layout.json 2018-05-29 18:13:02 +02:00
soupette
09ad42d1d2 Fixes #1262 2018-05-29 17:56:07 +02:00
soupette
85e638c901 Set values in placeholders when change the ct targets 2018-05-29 16:47:50 +02:00
Jim Laurie
50c30c79f4 Add oneToMany test and describe data independence 2018-05-29 16:30:29 +02:00
soupette
a7808b24e9 Refacto RelationBoc 2018-05-29 15:13:55 +02:00
Johann Pinson
de691ca47f
Fix toJSON verification 2018-05-29 15:08:43 +02:00
Okaris
89c97e6cae Added count to api template 2018-05-29 16:07:17 +03:00
Johann Pinson
fc85f8b47e
Merge branch 'master' into patch-content-manager 2018-05-29 12:01:37 +02:00
soupette
e0376cdd28 Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-05-29 11:46:56 +02:00
soupette
86bee64988 Use scss instead of styled-components in Filter 2018-05-29 11:29:40 +02:00
soupette
e73b44b6da Fix styled-components webpack config 2018-05-29 10:49:59 +02:00
Jim Laurie
9954905f44 Test manyToMany relations 2018-05-29 10:25:17 +02:00
Johann Pinson
ce2f41a5be feat(graphql): enable enum creation into schema from model 2018-05-28 17:45:26 +02:00
Johann Pinson
be4a45b5dd feat(graphql): add required flag 2018-05-28 17:31:42 +02:00
soupette
e517c5613a Fix css build 
I changed the Wrapper sub component in the FilterPickWrapper so it uses scss instead of styles components.
Apparently selectors are not working properly => need to check to webpack configuration.
 2018-05-28 16:58:39 +02:00
Jim LAURIE
11bab474ed
Merge pull request #1265 from johannpinson/patch-input-ui 
Fix ui helper field width inside content type builder
 2018-05-28 16:49:42 +02:00
Jim LAURIE
f3df2fa77f
Merge branch 'master' into patch-input-ui 2018-05-28 16:21:57 +02:00
Jim LAURIE
5f7aa5c770
Merge pull request #1267 from johannpinson/patch-ui-table 
Fix UI min-height in content-type table list
 2018-05-28 16:21:38 +02:00
soupette
1b5be59745 Fix css 2018-05-28 16:13:17 +02:00
Jim LAURIE
f9b3f27c6f
Merge branch 'master' into patch-ui-table 2018-05-28 16:03:49 +02:00
Jim LAURIE
5530f113d2
Merge pull request #1268 from johannpinson/patch-ui-admin 
Fix UI modal position in admin
 2018-05-28 16:03:36 +02:00
Johann Pinson
28b2512484 fix(admin): handle click if specified - update PropTypes 2018-05-28 15:47:51 +02:00
Jim LAURIE
d85ecc707f
Merge branch 'master' into patch-ui-admin 2018-05-28 15:45:00 +02:00
Jim LAURIE
fc9f77f803
Merge pull request #1285 from strapi/enhancement/doc 
Add section tracking documentation
 2018-05-28 15:44:46 +02:00
Jim LAURIE
61571505ee
Merge branch 'master' into enhancement/doc 2018-05-28 15:34:14 +02:00
cyril lopez
44359b921a
Update usage-tracking.md 2018-05-28 15:32:48 +02:00
cyril lopez
b250bc9198
Update SUMMARY.md 2018-05-28 15:27:57 +02:00
soupette
985739c660 Update build 2018-05-28 15:22:02 +02:00
Jim LAURIE
bb514d48ce
Merge pull request #1199 from okaris/oneway-relation-frontend 
Added oneWay relation option on frontend
 2018-05-28 15:19:13 +02:00
Jim LAURIE
5d89f1ef2f
Merge branch 'master' into oneway-relation-frontend 2018-05-28 15:09:52 +02:00
soupette
22bf58485e Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-05-28 14:59:32 +02:00
Aurelsicoko
4ca24a37de Add usage tracking link in the menu #1280 2018-05-28 14:39:02 +02:00
Aurelsicoko
88857db65d Add usage tracking section 2018-05-28 14:35:06 +02:00
Jim LAURIE
890db5970f
Merge pull request #1248 from raulriera/fix-typo 
Fix a typo in the error key
 2018-05-28 12:26:30 +02:00