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

5041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Johan Baath
bf0ac64b9c wait for the user plugin to load before redirection 2018-05-17 16:11:13 +02:00
Jim LAURIE
39aeacb674
Merge pull request #1221 from strapi/fix-order-plugins 
Fix order plugin upload
 2018-05-17 16:06:07 +02:00
Jim Laurie
8addd7f000 Fix order plugin upload 2018-05-17 16:05:18 +02:00
soupette
1c2ab4420b Remove useless components in both admin and ctm 2018-05-17 15:56:20 +02:00
soupette
d0e27e95a4 Created SlideDown components in helper plugin 
Move LoadingIndicator into the helper.
Start to use react-loadable in the content manager
 2018-05-17 15:38:06 +02:00
Jim LAURIE
412bc1389f
Merge pull request #1219 from strapi/fix/design 
Enhance & fix CSS
 2018-05-17 15:37:53 +02:00
Jim LAURIE
a619f5c645
Merge branch 'master' into fix/design 2018-05-17 15:18:12 +02:00
Jim LAURIE
2d0661929c
Merge pull request #1220 from strapi/fix-poly-relation 
Fix media relation update
 2018-05-17 15:14:40 +02:00
Aurelsicoko
bcb81a928e Remove layout.json & add it in .gitignore 2018-05-17 15:12:00 +02:00
Aurelsicoko
d816e5b313 Hide divider on hover 2018-05-17 15:05:53 +02:00
Jim Laurie
5175ee6336 Fix media relation update 2018-05-17 14:56:53 +02:00
soupette
056919ced7 Fix transition and reset showFilters on unmount hook 2018-05-17 14:11:23 +02:00
Aurelsicoko
9c8d87a8fd Remove log 2018-05-17 13:52:09 +02:00
Aurelsicoko
535e263203 Fix icons which were not displayed in list row 2018-05-17 13:44:32 +02:00
Aurelsicoko
818bbe8b78 Fix submit button newsletter 2018-05-17 13:39:42 +02:00
Aurelsicoko
4831610188 Fix toggle lang register page 2018-05-17 13:37:39 +02:00
Okaris
0d5e657a5a Fixed relation picker icon padding 2018-05-17 12:41:04 +03:00
Okaris
ae29802c07 Fixed ‘oneWay’ relation creating unnecessary attr 
When ‘oneWay’ relation is created the target model file is also updated with a reference to the relation. This is not required for a oneWay relation since it never will or can be populated from the other way around.
 2018-05-17 11:27:39 +03:00
Okaris
0408368481 Added oneWay relation option on frontend 2018-05-17 09:53:25 +03:00
soupette
b4bbc3917a Add transition to select filters 2018-05-16 18:59:29 +02:00
Jim LAURIE
6b2e1f2bde
Merge pull request #1208 from strapi/fix-merge 
Add missing requirement
 2018-05-16 18:21:16 +02:00
Jim Laurie
24e0a038c8 Add missing requirement 2018-05-16 18:17:13 +02:00
soupette
220e6baaef Harmonize content manager filters options to match the generated APIs 
Change the GlobalPagination & PageFooter params type
Apply these modifications into the plugins that were using those compos
 2018-05-16 17:10:43 +02:00
Jim LAURIE
7ff50b94d0
Merge pull request #1206 from strapi/fix-publish-build 
Fix fail build on publish npm release
 2018-05-16 15:27:09 +02:00
Jim Laurie
4069a3bdaf Fix fail build on publish npm release 2018-05-16 15:22:20 +02:00
soupette
ba89dcf5dd Add prettier 2018-05-16 15:03:54 +02:00
soupette
97d8200c6c Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-05-16 14:41:28 +02:00
soupette
fdad43f60d Created Filter component 2018-05-16 12:47:59 +02:00
Jim LAURIE
eeaba813e0
Merge pull request #1054 from strapi/eslint 
Eslint & Prettier
 2018-05-16 12:25:06 +02:00
soupette
4b9e7aa6c6 Remove deprecated lifecycle hook in content-manager containers 2018-05-16 12:08:39 +02:00
Jim Laurie
4fe7b6176e Fix conflicts & lint 2018-05-16 12:07:02 +02:00
soupette
a6318cafcc Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-05-16 11:29:32 +02:00
soupette
244489ee9d Created FilterOptions compo 2018-05-16 11:27:12 +02:00
Jim LAURIE
9db430a382
Merge pull request #1195 from strapi/improve-language-selector 
New locale selector design
 2018-05-16 10:57:25 +02:00
Jim LAURIE
1465a9b0d6
Merge branch 'master' into improve-language-selector 2018-05-16 10:48:01 +02:00
Jim LAURIE
12182ff9ee
Merge pull request #1201 from nurikabe/patch-4 
Fix spelling
 2018-05-16 10:47:01 +02:00
soupette
ea6266eb48 Fix name 2018-05-16 09:18:30 +02:00
soupette
f68315ec3e Fix import 2018-05-16 09:14:18 +02:00
Evan Owens
4086506acf
Fix spelling 2018-05-15 16:08:47 -04:00
Jim LAURIE
76bb31970f
Merge pull request #1197 from johannpinson/graphql-use-playground 
Move to GraphQL Playground
 2018-05-15 18:24:46 +02:00
Jim LAURIE
c5d11e270b
Merge branch 'master' into graphql-use-playground 2018-05-15 18:15:15 +02:00
Jim LAURIE
f881f4f35e
Merge pull request #1190 from strapi/reserved-attributes 
Disable reserved attributes
 2018-05-15 18:12:34 +02:00
Jim LAURIE
12bccbd8af
Merge branch 'master' into reserved-attributes 2018-05-15 18:02:07 +02:00
Jim LAURIE
d6e110ba39
Merge pull request #1192 from kamalbennani/bugfix/fixes-1061 
Fixes error when trying to access model ref inside of a GraphQL plugin
 2018-05-15 17:23:54 +02:00
Jim Laurie
e082672d53 Fix feedback PR 2018-05-15 17:20:46 +02:00
soupette
d9a4b2990f Init filter design 2018-05-15 17:01:47 +02:00
Johann Pinson
aeefa6156e feat(graphql): move to GraphQL Playground 2018-05-15 16:03:22 +02:00
soupette
17d04592b3 Fixes #1166 2018-05-15 14:47:19 +02:00
soupette
51f5adc56a Add styled-components 2018-05-15 14:07:18 +02:00
Jim Laurie
756accaab2 Fix conflicts 2018-05-15 13:55:46 +02:00