yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-09 17:26:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,547 Commits 115 Branches 488 Tags
Commit Graph

4547 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
6a720481b6 Fix anim 2018-05-30 13:59:49 +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
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
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
Jim LAURIE
cd42dcded2
Merge branch 'master' into fix-typo 2018-05-25 18:09:03 +02:00
soupette
1addba7398 Fixes #1231 2018-05-25 17:54:16 +02:00
soupette
5ec54d522c Remove comment 2018-05-25 17:30:19 +02:00
soupette
5366b1c6ad GraphQL filters 2018-05-25 17:03:43 +02:00
Jim LAURIE
2844d34ad1
Merge pull request #1266 from johannpinson/patch-graphql-timestamp 
Change names for timestamp fields in GraphQL plugin
 2018-05-25 16:46:54 +02:00
Jim LAURIE
e68bfba121
Merge branch 'master' into patch-graphql-timestamp 2018-05-25 16:24:22 +02:00
soupette
48514fa8c4 Fix strapi utils convert params function 2018-05-25 15:57:07 +02:00
soupette
688f44be7c Fix inputCheckbox proptypes 2018-05-25 14:43:04 +02:00
soupette
c95be9312d Merge branch 'fix/graphql' of github.com:strapi/strapi into content-manager-filters 2018-05-25 13:33:52 +02:00
soupette
3847fd8c67 Fix filter for decimal 2018-05-25 13:21:57 +02:00
soupette
88d5cc2c37 Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-05-25 12:23:55 +02:00
Jim LAURIE
40d5860d21
Merge pull request #1260 from johannpinson/patch-3 
Fix generate GraphQL schema if ShadowCRUD is false
 2018-05-24 19:26:13 +02:00
Jim LAURIE
93eb13e7dd
Merge branch 'master' into patch-3 2018-05-24 18:58:26 +02:00
Jim LAURIE
ab78d0a121
Merge pull request #1261 from johanbaath/fix-duplicate-permissions 
Fix clean up of duplicate permissions
 2018-05-24 18:58:09 +02:00
Jim LAURIE
b291cf1ab8
Merge branch 'master' into fix-duplicate-permissions 2018-05-24 18:48:05 +02:00
Jim LAURIE
88c598450c
Merge pull request #1245 from johannpinson/patch-2 
Update Union type creation rules for GraphQL
 2018-05-24 18:47:25 +02:00
Aurelsicoko
71ade27999 Fixes #1232 2018-05-24 18:41:36 +02:00
Jim LAURIE
27d37f970f
Merge branch 'master' into patch-2 2018-05-24 18:37:54 +02:00
Johann Pinson
4e8e495275 fix(admin): adjust modal size + position #1062 2018-05-24 18:29:19 +02:00
soupette
eecccbcbd8 Remove Json from available filters 2018-05-24 18:15:35 +02:00
Johann Pinson
93151ac2e2 fix(ui): add min-height for line in table content-type-builder #1076 2018-05-24 17:51:55 +02:00
soupette
81a96bcc46 Unmount InputWithAutofocus after close 2018-05-24 17:49:17 +02:00
Aurelsicoko
c111aaba13 Fixes #1247 2018-05-24 17:20:32 +02:00
Johann Pinson
534fa00c0b fix(graphql): change timestamp format snake_case to camelCase 2018-05-24 17:13:14 +02:00
Johann Pinson
340aecc743 fix(ui): input min-width for helper #1214 2018-05-24 17:06:47 +02:00
soupette
20d896c92a Open FilterPickWrapper when clicking on a filter with correct input autofocus 2018-05-24 14:40:43 +02:00
soupette
2ece502650 Add refs to inputs Date Select & Select 2018-05-24 13:59:58 +02:00