yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-28 15:44:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,776 Commits 138 Branches 514 Tags
Commit Graph

5776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
7906e43129 Fix conflicts 2018-09-14 13:48:43 +02:00
Jim LAURIE
a4a8f8d031
Merge pull request #1947 from strapi/3.0.0-alpha.14.1.1 
3.0.0 alpha.14.1.1
 2018-09-14 12:18:40 +02:00
Jim LAURIE
0e484e9099
Merge branch 'master' into 3.0.0-alpha.14.1.1 2018-09-14 12:18:31 +02:00
Jim LAURIE
4d8ace2db7 3.0.0-alpha.14.1.1 v3.0.0-alpha.14.1.1 2018-09-13 18:39:37 +02:00
Jim LAURIE
b773262624 Merge pull request #1946 from strapi/fix-build-graphql 
Fixes #1938
 2018-09-13 18:37:23 +02:00
Jim LAURIE
b004b245de
Merge pull request #1946 from strapi/fix-build-graphql 
Fixes #1938
 2018-09-13 18:36:16 +02:00
soupette
fa03ceef11 Fixes #1938 2018-09-13 18:08:32 +02:00
Jim LAURIE
ea51c9949f
Merge pull request #1935 from strapi/3.0.0-alpha.14.1 
3.0.0 alpha.14.1
 2018-09-13 14:51:40 +02:00
Jim LAURIE
44daf8d962
Merge branch 'master' into 3.0.0-alpha.14.1 2018-09-13 14:51:31 +02:00
Jim LAURIE
505fa3fa15
Merge pull request #1936 from maturanomx/minorChanges 
Fix bug on conditional code
 2018-09-13 11:46:49 +02:00
Alberto Maturano
bd94d7a7bb Fix bug on conditional code 
`'server.proxy' || {}` is **always** returning `server.proxy`. The real
intention is pass `{}` as default value for `_.get`.
 2018-09-12 12:55:30 -05:00
Jim LAURIE
45dfc328c2 Fix admin in dev mode v3.0.0-alpha.14.1 2018-09-12 15:47:28 +02:00
Jim LAURIE
f10335d717 3.0.0-alpha.14.1 2018-09-12 12:41:11 +02:00
Jim LAURIE
5ae787f4cb Add missing cross-spawn dependency 2018-09-12 12:39:53 +02:00
soupette
ea8059840b Fix conflicts 2018-09-10 20:22:21 +02:00
soupette
f994ae5d91 Fix deprecated param 2018-09-10 20:15:28 +02:00
soupette
c2c66d5cb8 Change directory 2018-09-10 20:00:17 +02:00
Jim LAURIE
34a4f3139b
Merge pull request #1926 from abhirathore2006/ContentTypeBuilder-plugin-bug-fix 
Fix content type generation with bookshelf.
 2018-09-10 18:40:45 +02:00
Jim LAURIE
090d9f4116
Merge branch 'master' into ContentTypeBuilder-plugin-bug-fix 2018-09-10 18:40:21 +02:00
Jim LAURIE
f926f16e23
Merge pull request #1570 from anshulk/master 
Lowercase email on local auth register
 2018-09-10 17:38:27 +02:00
Jim LAURIE
d2eb881ca8
Merge branch 'master' into master 2018-09-10 17:38:12 +02:00
Jim LAURIE
7835d0e8c0
Merge pull request #1854 from strapi/fix-file-reload 
Fix auto-reload on file change
 2018-09-10 15:13:13 +02:00
Jim LAURIE
c68fdb1120
Merge branch 'master' into fix-file-reload 2018-09-10 15:12:52 +02:00
Abhimanyu
6bba0c8db6 content-type-builder bugfix - Cannot read property 'toJS' of undefined 2018-09-10 17:04:21 +05:30
Jim LAURIE
b4dedc12f1
Merge pull request #1872 from hansemannn/patch-1 
Add reference about production databases
 2018-09-09 14:53:11 +02:00
Jim LAURIE
048d36173d
Merge branch 'master' into patch-1 2018-09-09 14:53:01 +02:00
Jim LAURIE
c97f352b19
Merge pull request #1893 from nobodywithbody/fix/remove-old-file 
Fix remove all files in item and add one
 2018-09-09 14:50:36 +02:00
Jim LAURIE
d9e3fde726
Merge branch 'master' into fix/remove-old-file 2018-09-09 14:32:33 +02:00
Jim LAURIE
d1ae79271d
Merge pull request #1921 from bardaq/patch-1 
Update RU translations
 2018-09-09 14:04:11 +02:00
Jim LAURIE
f729bb39cb
Merge branch 'master' into patch-1 2018-09-09 14:03:53 +02:00
Jim LAURIE
c23c323d69
Merge branch 'master' into fix-file-reload 2018-09-09 13:53:23 +02:00
Jim LAURIE
f1a7895a6c
Merge pull request #1916 from strapi/fix-1903 
Clean layout on content type delete
 2018-09-09 13:32:58 +02:00
Jim LAURIE
28580a7ee5
Merge branch 'master' into fix-1903 2018-09-09 13:32:34 +02:00
DmitryKlymenko
fdddab4ca8
Update ru.json 2018-09-09 12:43:19 +03:00
soupette
b8e42c55d6 Fix conflict 2018-09-07 17:47:04 +02:00
Jim LAURIE
c9cdab31d5
Merge pull request #1917 from strapi/fix-build 
Fix build
 2018-09-07 17:44:31 +02:00
Jim LAURIE
aef1af3140
Merge branch 'master' into fix-build 2018-09-07 17:44:01 +02:00
soupette
c865109337 Fixes #1914 2018-09-07 17:29:33 +02:00
Jim LAURIE
923226dc29
Merge pull request #1727 from strapi/enhancement/front-start 
Open admin on strapi start
 2018-09-07 17:06:20 +02:00
Jim LAURIE
145f22ee1e
Update random 2018-09-07 17:02:32 +02:00
soupette
270064e0cf Add error to LoadingIndicatorPage 2018-09-07 16:46:16 +02:00
Jim LAURIE
6fcaf96806 Clean layout on content tyep delete fix #1903 2018-09-07 15:59:59 +02:00
Jim LAURIE
31391ec711
Merge branch 'master' into enhancement/front-start 2018-09-07 15:14:55 +02:00
soupette
1e0b45f32a Remove loadable 2018-09-07 13:09:35 +02:00
soupette
b2d55b13a3 Fix pinput file 2018-09-07 12:47:45 +02:00
Jim LAURIE
674e323d88
Merge pull request #1855 from strapi/fix-date 
Fix saved date format content manager
 2018-09-07 12:33:22 +02:00
Jim LAURIE
1eb944b7f1
Merge branch 'master' into fix-date 2018-09-07 12:32:40 +02:00
soupette
4709b7996e Merge branch 'master' of github.com:strapi/strapi into add-description-to-plugins-routes 2018-09-07 12:24:41 +02:00
soupette
e46567db42 Add description to missing routes 2018-09-07 12:23:13 +02:00
soupette
f572780930 Update users-perm routes actionTypes 2018-09-07 10:33:40 +02:00