yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 02:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,300 Commits 121 Branches 507 Tags
Commit Graph

4300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
7088f70e94 Add steps in the CONTRIBUTING_GUIDE and plugin development sections 2018-04-30 14:00:08 +02:00
Zhuang
97531cc3d2 Merge branch 'master' of https://github.com/strapi/strapi into add_simply_chinese_translation 2018-04-30 16:56:19 +08:00
Jim LAURIE
f91be5ce63
Merge pull request #1060 from strapi/migration-doc-menu 
Add migration guide 11 to 12 in the menu
 2018-04-29 12:44:47 +02:00
Jim LAURIE
5ada6ebc72
Add migration guide 11 to 12 in the menu 2018-04-29 12:43:51 +02:00
Jim LAURIE
faf3ac98ca
Merge pull request #1056 from strapi/update-contributing 
Update CONTRIBUTING GUIDE
 2018-04-28 13:06:57 +02:00
Jim LAURIE
85c2f1a58a
Merge branch 'master' into update-contributing 2018-04-27 23:22:04 +02:00
Jim LAURIE
04f8f051d0
Merge pull request #1052 from strapi/fix/802 
Remove plugin key for API model
 2018-04-27 16:52:57 +02:00
soupette
b22929f006 Add new setup command to the contributing guide 2018-04-27 16:45:34 +02:00
Jim LAURIE
49ced583f3
Merge branch 'master' into fix/802 2018-04-27 16:40:57 +02:00
Jim LAURIE
b994e33b82
Merge pull request #1025 from strapi/sql-xp 
Improve SQL experience
 2018-04-27 16:40:23 +02:00
Jim LAURIE
9cc62373f0
Merge branch 'master' into sql-xp 2018-04-27 16:29:49 +02:00
Jim Laurie
b82cfc4676 Change email and password as string 2018-04-27 16:29:18 +02:00
Jim Laurie
ee75653cdd Handle required 2018-04-27 16:07:18 +02:00
Aurelsicoko
af41ef444c Fixes #802 2018-04-27 15:50:37 +02:00
Aurelsicoko
dffbf3bbb3 Concat promise to return a single array 2018-04-27 15:48:52 +02:00
Jim Laurie
d986cb4cc8 Fix relation table creation 2018-04-27 14:53:09 +02:00
Jim Laurie
8adc8ec200 Diff text / string 2018-04-27 14:17:50 +02:00
Jim Laurie
a6c0616dfc Handle update type 2018-04-27 13:47:09 +02:00
Jim LAURIE
29ac0efacf
Merge pull request #1047 from strapi/fix-978 
Fixes WYSIWYG insert image position
 2018-04-27 11:33:00 +02:00
cyril lopez
941726ba0c
Merge branch 'master' into fix-978 2018-04-27 09:27:51 +02:00
Jim LAURIE
98ca83cf5d
Merge pull request #1049 from Luukth/master 
Fix for host not in config.url
 2018-04-26 16:37:55 +02:00
Jim LAURIE
b07f20392e
Merge branch 'master' into master 2018-04-26 16:25:53 +02:00
Jim LAURIE
c3ad5fdd74
Merge pull request #1046 from strapi/fix-838 
Fixes settings-manager language deletion bug
 2018-04-26 16:25:37 +02:00
Jim LAURIE
0410f12cb1
Merge branch 'master' into fix-838 2018-04-26 16:12:55 +02:00
Luukth
fbd060d49a
Merge pull request #1 from Luukth/Luukth-patch-1 
Update configurations.js
 2018-04-26 16:02:00 +02:00
Luukth
4f83965fa9
Update configurations.js 
Fix for issue #800
this.config.url will now contain the host from the configuration file.
 2018-04-26 16:00:05 +02:00
soupette
58e16b8d4c Fixes #978 2018-04-26 15:10:30 +02:00
Jim LAURIE
d90cf10ded
Merge pull request #1045 from strapi/fix-1041 
Fixes DatePicker display
 2018-04-26 14:56:07 +02:00
Jim LAURIE
70cd38080e
Merge branch 'master' into fix-1041 2018-04-26 14:47:24 +02:00
Jim LAURIE
3f99ba3cc8
Merge pull request #1044 from strapi/fix-860 
Fixes multiple relationships on different models name
 2018-04-26 14:46:57 +02:00
Jim LAURIE
3416e46657
Merge branch 'master' into fix-860 2018-04-26 14:34:35 +02:00
Jim LAURIE
1570b594f9
Merge pull request #1033 from strapi/improve-webpack-config 
Improve webpack config
 2018-04-26 14:33:09 +02:00
soupette
22de691a13 Fixes #838 2018-04-26 14:21:17 +02:00
Jim LAURIE
1850d5539b
Merge branch 'master' into improve-webpack-config 2018-04-26 14:20:10 +02:00
Jim Laurie
273f22c70d Fix entry value 2018-04-26 14:10:17 +02:00
Jim LAURIE
587197c00f
Merge pull request #1043 from strapi/fix-770 
Block settings-manager & content-type-builder in production
 2018-04-26 14:08:07 +02:00
soupette
5c49e76610 Fix PR feedback 2018-04-26 14:07:31 +02:00
Jim Laurie
1ee8d9b30a Fix PR feedback - handle type float 2018-04-26 13:47:40 +02:00
soupette
d17f49c2e5 Fixes #1041 
I commented the DatetimeStyles import in the InputDate because it was messing with webpack.
Since the new config it is not doing it anymore.
 2018-04-26 13:44:26 +02:00
soupette
64984fded5 Fixes #860 2018-04-26 13:27:28 +02:00
soupette
d2b6667666 Fix menu footer css 2018-04-26 11:27:37 +02:00
soupette
42c64091e2 Fixes 770 2018-04-26 11:24:47 +02:00
soupette
611dfb32eb Merge branch 'master' of github.com:strapi/strapi into sql-xp 2018-04-26 10:26:09 +02:00
Jim LAURIE
09c403f79b
Merge pull request #1035 from pedrocruzio/patch-1 
Fixed misspelling in documentation text
 2018-04-26 00:28:39 +02:00
Pedro Cruz
ce52ad4fb4
Fixed misspelling in documentation text 2018-04-25 14:14:47 -04:00
soupette
9e876370e0 Add comments 2018-04-25 17:27:09 +02:00
soupette
b7fffb0ce7 Fixes #958 2018-04-25 16:34:20 +02:00
Jim Laurie
dcf020662c Fix manyToMany content manager 2018-04-25 15:40:49 +02:00
Jim LAURIE
1cdca712f7
Merge pull request #1026 from stephledev/master 
check if `strapi start` runs inside a strapi project
 2018-04-25 14:59:40 +02:00
soupette
fb35bc75e0 Fix monorepo setup 2018-04-25 14:59:28 +02:00