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
33,691 Commits 118 Branches 489 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
02dac8e579 Undo ctm service modifications 2018-04-19 15:52:51 +02:00
Abdón Rodríguez Davila
147725f689 Fix exec command in uninstall plugin 2018-04-19 15:49:16 +02:00
soupette
81383f3562 Fixes #959 2018-04-19 15:45:35 +02:00
Abdón Rodríguez Davila
686a278406
Fix exec command when the path has spaces 
Fixes #962
 2018-04-19 13:10:34 +02:00
Jim LAURIE
2e30854d6e
Merge branch 'master' into patch-2 2018-04-19 10:43:29 +02:00
Jim LAURIE
cace0454e5
Merge pull request #965 from abdonrd/patch-1 
Staging config as production config
 2018-04-19 10:42:57 +02:00
Juampy NR
6d366b78c1
Merge branch 'master' into fix-mysql-5.7 2018-04-18 19:05:16 +02:00
Juampy
32095d08c5 Fix invalid timestamp default values for MySQL 5.7 2018-04-18 19:01:19 +02:00
Jim LAURIE
2f09e58c2c
Merge branch 'master' into patch-1 2018-04-18 16:41:20 +02:00
Jim LAURIE
9e8c562787
Merge pull request #961 from strapi/3.0.0-alpha.12 
3.0.0-alpha.12
 2018-04-18 16:40:45 +02:00
Jim LAURIE
6cd2e04775
Merge branch 'master' into 3.0.0-alpha.12 2018-04-18 16:40:33 +02:00
Aurelsicoko
f4a9a36166 Merge branch 'reduce-setup-monorepo' of github.com:strapi/strapi into reduce-setup-monorepo 2018-04-18 16:33:04 +02:00
Jim LAURIE
afc6d1d946
Merge pull request #967 from strapi/doc/graphql 
Add graphql in doc menu
 2018-04-18 16:04:53 +02:00
Jim Laurie
0b314edc71 Add graphql in doc menu 2018-04-18 16:03:51 +02:00
Abdón Rodríguez Davila
620f8a1c2a
Fix post-install script 2018-04-18 15:38:14 +02:00
Abdón Rodríguez Davila
c6519cc4b0
Staging config as production config 2018-04-18 14:36:06 +02:00
Jim LAURIE
5f4eeb875e
Merge branch 'master' into 3.0.0-alpha.12 2018-04-18 14:26:36 +02:00
soupette
21e45890db Fixes #964 2018-04-18 14:25:56 +02:00
Jim LAURIE
9f8f774de6
Merge pull request #963 from abdonrd/patch-1 
Fix docs typo
 2018-04-18 14:25:30 +02:00
Aurelsicoko
0fd3aed124 Fix setup script 2018-04-18 14:09:59 +02:00
Abdón Rodríguez Davila
9f9556a26b
Fix docs typo 2018-04-18 14:00:26 +02:00
Jim Laurie
ebd144fddb 3.0.0-alpha.12 v3.0.0-alpha.12 2018-04-18 12:03:16 +02:00
Jim LAURIE
2ad5c85d7b
Merge pull request #960 from strapi/update/translations 
Remove price
 2018-04-18 12:00:37 +02:00
cyril lopez
77bc3975c4
Merge branch 'master' into reduce-setup-monorepo 2018-04-18 11:54:36 +02:00
soupette
f419f9383c Fix setup time info 2018-04-18 11:51:16 +02:00
Aurelsicoko
5320c417a5 Remove price 2018-04-18 11:43:55 +02:00
Jim LAURIE
52f3da7266
Merge pull request #956 from strapi/fix/upload 
Fix uploaded file on create
 2018-04-18 10:31:59 +02:00
Aurelsicoko
f01b7befd1 Display createdAt and updatedAt date with GraphQL 2018-04-17 18:16:31 +02:00
Aurelsicoko
f7b41dbc01 Fix uploaded file on create 2018-04-17 17:50:23 +02:00
Jim LAURIE
5f0787c4da
Merge pull request #899 from strapi/graphql 
GraphQL - Queries
 2018-04-17 17:46:09 +02:00
Aurelsicoko
96934a23da Improve retrieving of relationships with GraphQL 2018-04-17 17:29:24 +02:00
Aurelsicoko
2d1d642c32 Fix setup 2018-04-17 16:26:34 +02:00
Aurelsicoko
53bedf277b Fix version number in left menu 2018-04-17 16:05:10 +02:00
Aurelsicoko
79e3b56a1e Remove unnecessary admin and add GraphQL logo 2018-04-17 15:24:17 +02:00
Aurelsicoko
ad46c6b40a Merge branch 'master' of github.com:strapi/strapi into graphql 2018-04-17 15:10:30 +02:00
Jim Laurie
fd55859c4b Add missing dependency 2018-04-17 15:03:28 +02:00
cyril lopez
f0eca93f93
Merge branch 'master' into reduce-setup-monorepo 2018-04-17 12:04:55 +02:00
Jim LAURIE
2d337df7a0
Merge pull request #950 from strapi/add-articles-to-dashboard 
Add latest articles to HomePage
 2018-04-17 11:54:26 +02:00
soupette
fcc374c3fd Fix conflicts 2018-04-17 11:50:52 +02:00
soupette
7b87af5e1b Remove prebuild test and update documentation 2018-04-17 11:49:09 +02:00
soupette
58dd77acb9 Allow async build 2018-04-17 11:43:47 +02:00
Jim Laurie
4364c33afe Remove prepublish admin build 2018-04-17 11:20:13 +02:00
Jim LAURIE
67e4f37c03
Merge branch 'master' into graphql 2018-04-17 11:18:28 +02:00
Aurelsicoko
aa6fdb2c93 Resolve conflicts 2018-04-17 11:12:41 +02:00
Aurelsicoko
d96192025b Add link on blog articles 2018-04-17 11:10:23 +02:00
soupette
6f64fc83fe Allow setup without building plugins 2018-04-17 10:30:30 +02:00
Jim LAURIE
afac8b5582
Merge pull request #948 from strapi/doc-upload 
Add upload provider documentation
 2018-04-17 10:23:03 +02:00
soupette
d620053799 Add username to welcome block 2018-04-16 18:57:08 +02:00
soupette
f13ace8599 Add latest articles to HomePage 2018-04-16 18:13:36 +02:00
Jim LAURIE
c0ea8fa807
Merge branch 'master' into graphql 2018-04-16 16:39:50 +02:00