yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-26 00:39:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,455 Commits 129 Branches 498 Tags
Commit Graph

4455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
773a15d1cb Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-05-18 14:59:30 +02:00
soupette
f3bdbff968 Fix conflicts 2018-05-18 14:56:40 +02:00
Jim LAURIE
6126645581
Merge pull request #1228 from strapi/lauriejim-patch-1 
Remove prettier
 2018-05-18 14:21:31 +02:00
Jim LAURIE
2393a6cef9
Remove prettier 
Waiting for prettier indent fix
 2018-05-18 14:21:05 +02:00
soupette
283dfc7972 Retrieve schema 2018-05-18 11:41:42 +02:00
Jim LAURIE
b2fb8c9022
Merge pull request #1205 from strapi/add-prettier 
Add prettier on pre-commit
 2018-05-18 11:24:34 +02:00
Jim LAURIE
a64e19861f
Merge branch 'master' into add-prettier 2018-05-18 11:16:00 +02:00
Jim LAURIE
75ce8ea0be
Merge pull request #1196 from strapi/add-styled-component 
Add styled-components
 2018-05-18 11:15:41 +02:00
Jim LAURIE
74d3987a11
Merge branch 'master' into add-styled-component 2018-05-18 11:07:32 +02:00
Jim LAURIE
53e7c8f2cd
Merge pull request #1222 from johanbaath/fix-auth-redirect 
Wait for the user plugin to bootstrap before redirection
 2018-05-18 11:06:49 +02:00
soupette
1543160819 Add Loadable to inputs 2018-05-18 10:58:51 +02:00
Jim LAURIE
40cfa26c74
Merge branch 'master' into fix-auth-redirect 2018-05-18 10:57:40 +02:00
Jim LAURIE
b4ca0c88c5
Merge pull request #1223 from strapi/3.0.0-alpha.12.2 
3.0.0-alpha.12.2
 2018-05-18 10:53:21 +02:00
Johan Baath
7e6f7dcbf4 remove whitespace 2018-05-17 19:06:52 +02:00
soupette
7333116119 Handle add and remove filter 2018-05-17 18:35:41 +02:00
soupette
6c14dbf8fa Prepare for dynamic filters 2018-05-17 17:57:45 +02:00
Jim Laurie
31c0d7457a 3.0.0-alpha.12.2 v3.0.0-alpha.12.2 2018-05-17 16:54:27 +02:00
soupette
559c862e26 Add dynamic PluginHeaderTitle in FiltersPickWrapper 2018-05-17 16:25:02 +02:00
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
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