yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-06 23:28:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,274 Commits 120 Branches 493 Tags
Commit Graph

4274 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
XcrossD
1705b4d065
Merge branch 'master' into master 2018-04-23 11:27:40 +08:00
XcrossD
43357bf49b
Update LeftMenuFooter style 2018-04-23 11:20:14 +08:00
Zhuang
473ceaaae0 add simply translation of strapi-plugin-settings-manager 2018-04-22 22:16:37 +08:00
Zhuang
77c6506ff1 add Simple Chinese translation 2018-04-22 22:00:10 +08:00
Zhuang
e69dcc433b reload grant value to db when add/delete provider 2018-04-21 12:29:00 +08:00
Jim LAURIE
6b8f430872
Merge pull request #989 from strapi/fix/graphql 
Snakecase attribute in GraphQL when there is a dash
 2018-04-21 01:44:15 +02:00
Jim LAURIE
32671ed5e6
Merge branch 'master' into fix/graphql 2018-04-20 18:01:52 +02:00
Jim Laurie
96b32fbea4 Remove sqlite and redis on strapi start and remove sqlite support 2018-04-20 17:59:47 +02:00
Jim LAURIE
6d75b4341d
Merge pull request #986 from strapi/enhance/sql-dev 
Easily use MySQL project in development mode
 2018-04-20 17:59:23 +02:00
Jim LAURIE
4deb87078c
Merge branch 'master' into enhance/sql-dev 2018-04-20 17:41:25 +02:00
Aurelsicoko
0e5eb549bc Only install at the root of the node_modules folder in developer mode 2018-04-20 17:38:06 +02:00
Jim Laurie
413ce2535a Error message for sever connection or database creation 2018-04-20 17:30:56 +02:00
Jim LAURIE
711d17d5d5
Merge pull request #984 from strapi/fix/782 
Disable CSRF in production & harmonize allowed headers
 2018-04-20 16:56:47 +02:00
Aurelsicoko
243e5cf74d Snakecase attribute in GraphQL when there is a dash 2018-04-20 16:30:28 +02:00
Jim LAURIE
1fbc87adba
Merge branch 'master' into fix/782 2018-04-20 16:29:30 +02:00
Aurélien GEORGET
575814730d
Allow Origin header on production configuration as well 2018-04-20 15:50:18 +02:00
Aurelsicoko
d6180d4148 Easily use MySQL project in development mode 2018-04-20 15:31:57 +02:00
Aurelsicoko
5416cd60a0 Disable CSRF in production & harmonize allowed headers 2018-04-20 13:55:41 +02:00
Jim LAURIE
1b9134561d
Merge pull request #982 from strapi/fix/symlinks 
Fix symlinks during project generation
 2018-04-20 13:49:57 +02:00
Jim LAURIE
e911111860
Merge branch 'master' into fix/symlinks 2018-04-20 12:29:10 +02:00
Jim LAURIE
1cf5c518ae
Merge pull request #980 from strapi/fix-ctm-limit 
Changing the limit in the content manager
 2018-04-20 12:28:24 +02:00
Aurelsicoko
302f95873e Fix symlinks during project generation 2018-04-20 12:12:34 +02:00
Jim LAURIE
a99ccebcbc
Merge branch 'master' into fix-ctm-limit 2018-04-20 11:59:14 +02:00
Jim LAURIE
ddf9799027
Merge pull request #981 from strapi/migration-guide 
Add migration guide 11 to 12
 2018-04-20 11:59:01 +02:00
Jim LAURIE
dc987556b8
Merge branch 'master' into migration-guide 2018-04-20 11:40:54 +02:00
Jim LAURIE
c15874e6b9
Fix versions 2018-04-20 11:38:23 +02:00
Jim LAURIE
6487fde8dc
Merge pull request #966 from abdonrd/patch-2 
Fix post-install script
 2018-04-20 11:26:49 +02:00
Jim Laurie
4d8a852cdf Add migration guide 11 to 12 2018-04-20 11:26:28 +02:00
Jim LAURIE
55dbf463fe
Merge branch 'master' into patch-2 2018-04-20 10:49:20 +02:00
soupette
2817ad6a33 Fixes #979 2018-04-20 10:49:05 +02:00
Jim LAURIE
cd1af7ebcf
Merge pull request #973 from abdonrd/patch-1 
Fix exec command when the path has spaces
 2018-04-20 10:47:37 +02:00
soupette
44d3519130 remove relations 2018-04-19 17:23:23 +02:00
soupette
5a9e9ef53b Fixes #959 2018-04-19 17:19:56 +02:00
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