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
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
Kamal Bennani
f76e9baac9
Take into account allowGa config prop 2018-07-16 23:47:08 +02: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
soupette
5620101613 Fix bug when no relations for the editDisplay object 2018-07-16 18:53:33 +02:00
soupette
cd5419468c Add data in editDisplay object in order to override the label and placeholder of an input 2018-07-16 18:45:52 +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
soupette
17a39af8ef Apply sort for relations in edit view 2018-07-16 17:26:51 +02:00
soupette
ecb9f306e3 Display edit input form 2018-07-16 16:36:26 +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
soupette
8c31a060f7 Handle add relation in dropdown 2018-07-16 16:11:16 +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
soupette
2a753fbb92 Sort relations 2018-07-16 15:18:21 +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
soupette
6cc063e98c Add new key in schema to display the editView fields 
Design the relation drag & sort
 2018-07-16 12:29:57 +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
Kamal Bennani Bouchiba
9c0ec12546
Merge branch 'master' into bugfix/#1576/server-does-not-restart-after-files-changes 2018-07-15 16:18:51 +02:00
Kamal Bennani
fed929455d
Reset the reloading state after files changes 2018-07-15 15:51:30 +02:00
Jim LAURIE
3039b6dc69
Merge branch 'master' into Update_Docs_DM 2018-07-15 12:13:58 +02:00
Ben Ackroyd
275f50bf73 Don't parse npm scripts for dynamic config 
Fixes #916
 2018-07-15 19:54:52 +10: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
Yilin Gan
7eb038b7d7 add mime type for asw upload 2018-07-13 11:33:44 -07:00
Yilin Gan
1cf971950a add file path for aws upload 2018-07-13 11:30:38 -07:00
Jim LAURIE
c7d4858f4e Fix rename readme 2018-07-13 17:03:34 +02:00
Jim LAURIE
d79a16b18c Fix hook lazy loading 2018-07-13 16:59:57 +02:00
Anshul Kushwaha
18e8d69775
Lowercase email on local auth register 2018-07-13 20:29:41 +05:30
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