yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-10 09:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,877 Commits 115 Branches 488 Tags
Commit Graph

5877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim LAURIE
5b633efacf Fix API generator database hook 2018-07-13 16:42:10 +02:00
Jim LAURIE
9bf04f5fef Fix conflict 2018-07-13 15:42:14 +02:00
soupette
807ded44a1 Merge branch 'master' of github.com:strapi/strapi into settings-ctm-edit-view 2018-07-13 14:05:36 +02:00
soupette
ad72a4f66d Remove the admin folder (front-end part of a plugin) from the files to watch so webpack so we can have hot reload with webpack 2018-07-13 14:04:06 +02:00
Jim LAURIE
02129dc1d8
Merge pull request #1560 from maturano/bug/tmpPathYarn 
Fix temp directory reference for Yarn
 2018-07-13 12:39:05 +02:00
soupette
3890bc1211 Fix conflict 2018-07-13 12:33:52 +02:00
Jim LAURIE
053046c168
Merge branch 'master' into bug/tmpPathYarn 2018-07-13 12:21:09 +02:00
Jim LAURIE
94dce3444c
Merge pull request #1527 from waful/master 
Content Manager: fix react-select blowing away user input on rerender
 2018-07-13 12:20:44 +02:00
soupette
0b1a280c7a Add PopUpWarning in edit page to warn before cancel changes 2018-07-13 12:19:07 +02:00
soupette
927e5afb50 Add PopUpWarning when cancelling modifications in settings views 2018-07-13 12:07:59 +02:00
soupette
c2c9d95d1a Fix PR feedback 2018-07-13 11:48:35 +02:00
Erin Dachtler
c0554e8571
Fix for JSON attribute types in GraphQL 
Fixes #1476
 2018-07-12 12:37:19 -07:00
DMehaffy
cfb68eca0f Update per comments 2018-07-12 11:11:43 -07:00
DMehaffy
8ca7500326
Merge branch 'master' into Update_Docs_DM 2018-07-12 11:10:56 -07:00
Alexis Vassilopoulos
7e94324189 Spanish Translations 2018-07-12 19:32:34 +02:00
Jim LAURIE
634165c379 Fix strapi utils hook detection 2018-07-12 17:27:32 +02:00
Vasilis Kortsimelidis
53fa2eb279 Updated the CLI docks 2018-07-12 15:59:35 +01:00
Vasilis Kortsimelidis
c2d7d8f21d Made new options optional - Merged them to the answers object 2018-07-12 15:50:05 +01:00
Jim LAURIE
e888007878 Fix hook dependencies 2018-07-12 14:31:39 +02:00
Jim LAURIE
7d12a89f8f Fix custom hook load 2018-07-12 12:36:45 +02:00
cyril lopez
c3d7d98604
Merge branch 'master' into master 2018-07-12 11:54:41 +02:00
Alberto Maturano
beeaa55bd5 Fix temp directory reference for Yarn 
Also: fix logic detecting installation with Yarn and fix minor linter
errors.

related #1548 & #1463
 2018-07-11 22:44:04 -05:00
Vasilis Kortsimelidis
1ba62cc591 Add two options at CLI - SSL and db auth 2018-07-11 16:42:12 +01:00
Jim LAURIE
cf8184e223 Use hook prefix and rename 2018-07-11 16:23:14 +02:00
Jim LAURIE
2482d5488f
Merge pull request #1549 from strapi/fix-yarn 
Fix yarn
v3.0.0-alpha.12.7.1 		2018-07-10 18:42:43 +02:00
Jim LAURIE
fa94d12e4f 3.0.0-alpha.12.7.1 2018-07-10 18:10:42 +02:00
Jim LAURIE
8a0bca029a Fix yarn not exist 2018-07-10 18:02:37 +02:00
Jim LAURIE
fc64bc7d69
Merge pull request #1547 from strapi/3.0.0-alpha.12.7 
3.0.0-alpha.12.7
 2018-07-10 17:30:44 +02:00
Jim LAURIE
a6d48caad9 3.0.0-alpha.12.7 2018-07-10 15:37:47 +02:00
Jim LAURIE
a7c505fa28
Merge pull request #1537 from synth3tk/mongo-parser 
Add "useNewUrlParser" Mongoose connection option
v3.0.0-alpha.12.7 		2018-07-10 14:17:41 +02:00
Jim LAURIE
ac8c8397a3
Merge branch 'master' into mongo-parser 2018-07-10 13:59:56 +02:00
Jim LAURIE
9ae0c85b5b
Merge pull request #1453 from strapi/yarn-install 
Yarn support
 2018-07-10 11:44:56 +02:00
Aurélien GEORGET
d4a874c8ee
Update package.json.js 2018-07-10 11:26:35 +02:00
Jim LAURIE
a048e29bb0
Merge branch 'master' into yarn-install 2018-07-10 11:14:44 +02:00
soupette
b902367790 Fix PR feedback 2018-07-10 11:08:58 +02:00
Jim LAURIE
70c9f3f069
Merge pull request #1545 from kishu/language-ko_kr 
Fixed typos in Korean language
 2018-07-10 10:52:25 +02:00
Jim LAURIE
236d2a62ed
Merge branch 'master' into language-ko_kr 2018-07-10 10:44:25 +02:00
DMehaffy
01ca0434d9
Merge branch 'master' into Update_Docs_DM 2018-07-10 00:53:13 -07:00
DMehaffy
2abf6d46c5 Update Admin build Docs 2018-07-10 00:50:59 -07:00
Jim LAURIE
f5175bee36
Merge pull request #1337 from DanielRuf/chore/cache-dependencies 
Clear cache dependencies on Travis tests
 2018-07-10 09:49:41 +02:00
Jim LAURIE
51b32625cf
Merge branch 'master' into chore/cache-dependencies 2018-07-10 09:39:17 +02:00
Taihoon Kim
414453e02e fixed typos in Korean language 2018-07-10 14:13:13 +09:00
Jim LAURIE
f11b6da405
Merge pull request #1517 from strapi/improve-sql-table 
Improve SQL table creation/update performance
 2018-07-09 19:44:05 +02:00
Jim LAURIE
27a118522e
Merge branch 'master' into improve-sql-table 2018-07-09 19:29:17 +02:00
Jim LAURIE
30fed8ab78
Merge pull request #1530 from strapi/fix-1518 
Fixes Image Preview in InputFile
 2018-07-09 18:05:16 +02:00
Jim LAURIE
404c7474e2
Merge branch 'master' into fix-1518 2018-07-09 15:09:57 +02:00
Jim LAURIE
5cba57f91d
Merge pull request #1531 from strapi/fix-1387 
Fixes oneWay relation
 2018-07-09 15:08:11 +02:00
Jim LAURIE
13170a7678
Merge branch 'master' into fix-1387 2018-07-09 14:36:50 +02:00
cyril lopez
f8b6edb23f Fix display with onWay relation 2018-07-09 14:04:20 +02:00
David Thomas
c1d8b5e6ba Add "useNewUrlParser" Mongo driver connection option 
Fixes #1532
 2018-07-08 12:52:16 -04:00