yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-03 03:17:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,111 Commits 121 Branches 507 Tags
Commit Graph

5111 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim LAURIE
a53d628438
Merge pull request #1582 from Velua/patch-1 
Clarified path for plugins providers configs
 2018-07-17 10:56:35 +02:00
John Williamson
ea35200b8c
Update upload.md 2018-07-17 14:06:12 +10:00
John Williamson
a1330a5d81
clarified path 2018-07-17 13:52:18 +10:00
Jim LAURIE
c8252724b5
Merge pull request #1536 from synth3tk/master 
Skip number conversion on string fields
 2018-07-16 19:07:57 +02:00
Jim LAURIE
dc9de9abd2
Merge branch 'master' into master 2018-07-16 18:59:08 +02:00
Jim LAURIE
eed7193b13
Merge pull request #1513 from bahdcoder/fix-update-providers-issue 
Fix Update Providers Issue
 2018-07-16 18:08:18 +02:00
Jim LAURIE
896077c6f8
Merge branch 'master' into fix-update-providers-issue 2018-07-16 17:50:04 +02:00
Jim LAURIE
dafb97665a
Merge pull request #1510 from johannpinson/patch-7 
Fix Upload plugin for find query with filter
 2018-07-16 16:25:53 +02:00
Jim LAURIE
33c138cece
Merge branch 'master' into patch-7 2018-07-16 16:08:29 +02:00
Jim LAURIE
ea00d491aa
Merge branch 'master' into fix-update-providers-issue 2018-07-16 16:07:30 +02:00
Jim LAURIE
6fb45797fb
Merge pull request #1555 from vaskort/add-ssl-auth-db-CLI-options 
Add two options for the CLI - SSL and DB auth
 2018-07-16 12:40:23 +02:00
Jim LAURIE
74a52e57f1
Merge branch 'master' into add-ssl-auth-db-CLI-options 2018-07-16 12:31:15 +02:00
Jim LAURIE
ace0a7eca1
Merge pull request #1529 from strapi/settings-ctm 
Content-manager customisation
 2018-07-16 11:06:30 +02:00
Jim LAURIE
fabe370f90
Merge branch 'master' into settings-ctm 2018-07-16 10:56:26 +02:00
Jim LAURIE
2b6b2271b1
Merge pull request #1546 from derrickmehaffy/Update_Docs_DM 
Update Admin build Docs
 2018-07-16 09:44:38 +02:00
Jim LAURIE
3039b6dc69
Merge branch 'master' into Update_Docs_DM 2018-07-15 12:13:58 +02:00
David Thomas
c785248b2c Fix removal of the filter keyword for field type comparison 2018-07-13 19:25:40 -04:00
David Thomas
422530ceed Update fieldType comparison operator to strict 2018-07-13 18:00:47 -04:00
David Thomas
b3b2b32dd8 Merge branch 'master' of github.com:strapi/strapi 2018-07-13 17:52:43 -04: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
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
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
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
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