yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-07 16:29:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,761 Commits 112 Branches 488 Tags
Commit Graph

6761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David Thomas
6143c3e1ca Skip number conversion on string fields 
Fixes #1524
 2018-07-08 09:50:48 -04:00
Jim LAURIE
09e8892190
Merge branch 'master' into yarn-install 2018-07-08 10:57:51 +02:00
Jim LAURIE
aab2f3e06c
Merge pull request #1528 from kishu/language-ko_kr 
Korean Language Support
 2018-07-08 10:54:39 +02:00
kishu
dea62861f0 update language list in admin panel to be scrollable 
Squashed commits:
[91c28113b] update language list in admin panel to be scrollable
 2018-07-08 15:31:45 +09:00
kishu
5edf9111cf fixed typos 2018-07-08 15:12:00 +09:00
Broc Gailit
c9800a6581
Merge branch 'master' into master 2018-07-06 14:01:39 -07:00
cyril lopez
3f6da374cb Fixes #1387 #1374 2018-07-06 14:39:18 +02:00
cyril lopez
d319d22f91 Fixes #1518 2018-07-06 14:15:59 +02:00
Taihoon Kim
14c2376216
Merge branch 'master' into language-ko_kr 2018-07-06 20:49:57 +09:00
cyril lopez
f1bc53aea3 Fix apply default settings to new apis 2018-07-06 13:21:50 +02:00
Jim LAURIE
b48dced09d
Merge pull request #1520 from strapi/api-search 
Add search in generated API
 2018-07-06 13:15:42 +02:00
cyril lopez
92b86bed81 Add comments 2018-07-06 12:40:16 +02:00
cyril lopez
6af99aebdc Fix css 2018-07-06 12:34:11 +02:00
Jim LAURIE
a4d3bbf25a
Merge branch 'master' into api-search 2018-07-06 11:52:35 +02:00
Taihoon Kim
5cfb9e9439 Korean Language Support 2018-07-06 15:34:20 +09:00
Wanfung Lee
30371a42bb
Workaround fix for react-select rerender bug 
https://github.com/JedWatson/react-select/issues/2277
 2018-07-05 23:31:32 -07:00