yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-22 23:59:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,691 Commits 121 Branches 490 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim LAURIE
878962c1be
Merge pull request #1824 from FarooqAR/patch-1 
Fixed grammatical errors
 2018-08-28 18:22:00 +02:00
sundaycrafts
75a83c0f21 strapi supports srv uri 2018-08-29 01:20:56 +09:00
Vladislav Arsenev
d234b20d88
Merge branch 'master' into fix/multiple-files-cancel 2018-08-28 19:02:29 +03:00
Andrés Franco
dbd0040a36 Adds ability to emit errors 2018-08-28 17:05:34 +02:00
DMehaffy
b5a0fd90c8 Fix port typo in docs 2018-08-28 03:37:22 -07:00
soupette
f887879c02 Add missing translations files 2018-08-28 12:29:28 +02:00
DMehaffy
53fb70cdda Fix missing title in adminUI 2018-08-28 03:08:41 -07:00
DMehaffy
4ae6722674 Testing fix for adminui 2018-08-28 02:45:52 -07:00
DMehaffy
282d1a3749 Fix typo :( 2018-08-28 02:40:08 -07:00
DMehaffy
1b20de5f6f Add en names 2018-08-28 01:23:08 -07:00
DMehaffy
76befdbc26 Fix strapi can't find proxy config 
Thank you @MartinMuzatko for your help
 2018-08-28 01:12:53 -07:00
Farooq Abdul Rehman
3674f21e11
Fixed grammatical errors 2018-08-28 10:03:29 +05:00
sundaycrafts
f7247112f6 fix error handling 2018-08-28 12:50:35 +09:00
avallete
e77f09bba5 fix(tests): handle properly subchildrens process on test script 
Switch from exec to spawn to kill children and sub-children
in the same time from the main test process.

Also add some error handling, and make the program exit with error
code (1) if anything goes wrong during execution.
 2018-08-27 20:58:26 +02:00
Jim LAURIE
db03dccac0
Merge pull request #1817 from derrickmehaffy/fixRegisterTemplate 
Update register email template
 2018-08-27 18:05:11 +02:00
Jim LAURIE
19486ded6e
Merge branch 'master' into fixRegisterTemplate 2018-08-27 18:05:02 +02:00
Jim LAURIE
095e9701c6
Merge pull request #1815 from avallete/avallete-add-new-provider-doc 
Document how to add a new auth provider
 2018-08-27 17:47:09 +02:00
Jim LAURIE
282d42aa2f
Merge branch 'master' into avallete-add-new-provider-doc 2018-08-27 17:46:20 +02:00
Jim LAURIE
72e9e90225
Merge pull request #1808 from nobodywithbody/fix/validation-check-null 
Add check for length property may not exist
 2018-08-27 17:32:41 +02:00
Jim LAURIE
ed2e4112b1
Merge branch 'master' into fix/validation-check-null 2018-08-27 17:32:04 +02:00
DMehaffy
8160b730b4 Merge branch 'master' into fix1551 2018-08-27 08:23:33 -07:00
Jim LAURIE
4f3b9cb59a
Merge pull request #1816 from strapi/3.0.0-alpha.14 
3.0.0-alpha.14
 2018-08-27 17:12:37 +02:00
DMehaffy
56de235297 Modify template for english 2018-08-27 08:11:23 -07:00
DMehaffy
d16191576a Add semicolons per feedback 2018-08-27 08:05:44 -07:00
DMehaffy
fb6a38c593 Update based on PR Feedback 2018-08-27 07:44:36 -07:00
Jim LAURIE
cecef7385f 3.0.0-alpha.14 v3.0.0-alpha.14 2018-08-27 16:30:16 +02:00
avalleteau
0627fa8411 docs(authentication): Document how to add a new auth provider 2018-08-27 16:16:16 +02:00
DMehaffy
6a81035c09 Merge remote-tracking branch 'upstream/master' into fix1551 2018-08-27 07:07:24 -07:00
DMehaffy
38c4a528e2 Add proxy config to Settings-Manager 2018-08-27 07:06:24 -07:00
Jim LAURIE
9ae1a585bc
Merge pull request #1814 from strapi/fix-input-toggle 
Fix input toggle true false
 2018-08-27 15:54:16 +02:00
soupette
e5e2af960c Fix input toggle true false 2018-08-27 15:47:41 +02:00
DMehaffy
9c704f115f Merge remote-tracking branch 'upstream/master' into fix1551 2018-08-27 06:28:34 -07:00
DMehaffy
617324abee Basic global proxy support 2018-08-27 06:27:42 -07:00
sundaycrafts
8598483915
Merge branch 'master' into polish-pluginjs 2018-08-27 22:07:44 +09:00
sundaycrafts
ae7b470688 fix typo in comment 2018-08-27 22:03:05 +09:00
Jim LAURIE
2407b3711c
Merge pull request #1812 from strapi/fix-pluralize 
Add missing pluralize dependency
 2018-08-27 15:00:06 +02:00
Jim LAURIE
bcf681d9cc
Fix space 2018-08-27 14:59:41 +02:00
Jim LAURIE
44294d228d Add missing pluralize dep fix #1690 2018-08-27 14:57:47 +02:00
sundaycrafts
e8e2d134da Merge branch 'master' into polish-pluginjs 2018-08-27 21:36:31 +09:00
sundaycrafts
fcd5db11fa beautify plugins.js in strapi core 2018-08-27 21:34:50 +09:00
Jim LAURIE
8983521eb0
Merge pull request #1811 from strapi/fix/srv 
Fix srv
 2018-08-27 14:06:06 +02:00
Jim LAURIE
0ac7c132fc Fix srv 2018-08-27 14:01:56 +02:00
Vladislav Arsenev
ec681a43f0
Merge branch 'master' into fix/multiple-files-cancel 2018-08-27 11:14:11 +03:00
Vladislav Arsenev
2887f6e7be fix: validation-check-null - add check for length property may not exist 2018-08-27 10:41:00 +03:00
Jim LAURIE
9e63da5edf
Merge pull request #1806 from strapi/fix-test-launch-jsdom 
Fix JSDOM jest tests
 2018-08-26 17:15:01 +02:00
Jim LAURIE
2c4c0fd921 Fix JSDOM jest tests 2018-08-26 17:13:58 +02:00
sundaycrafts
29989db029 WIP: support srv uri 2018-08-26 04:18:09 +09:00
sundaycrafts
fc77ef67bd fix connectivity.js uri form 2018-08-26 04:18:02 +09:00
sundaycrafts
a6dd82e64c polish plugins.js in strapi core 2018-08-26 04:05:28 +09:00
Sean Wilson
67bd9fd115
changed "You can access to" to "You can access" 2018-08-25 01:28:47 -04:00