6761 Commits

Author SHA1 Message Date
Jim LAURIE
4132aaca5f
Merge pull request #1802 from sundaycrafts/polish-pluginjs
Polish plugin.js for more readable
2018-08-29 14:20:45 +02:00
Jim LAURIE
bebca2f16f
Merge branch 'master' into polish-pluginjs 2018-08-29 14:20:25 +02:00
Jim LAURIE
0074b35e6d
Merge pull request #1800 from seanc/patch-1
Changed "You can access to" to "You can access"
2018-08-29 13:06:04 +02:00
Jim LAURIE
4189ce83e9
Merge branch 'master' into patch-1 2018-08-29 13:05:39 +02:00
Jim LAURIE
2fc1612602
Update derrickmehaffy feedback 2018-08-29 13:05:22 +02:00
Jim LAURIE
ac00bce56b
Merge pull request #1712 from strapi/fix/autoReload
Fix auto reload
2018-08-29 12:23:11 +02:00
Jim LAURIE
eace470998 Fix build 2018-08-29 12:14:54 +02:00
Martin Muzatko
08bd24c01e Migrated to Vuepress 2018-08-29 12:09:51 +02:00
Martin Muzatko
1873a6f62a Migrated to Vuepress 2018-08-29 12:03:59 +02:00
Jim LAURIE
d56d75b05b
Merge branch 'master' into fix/autoReload 2018-08-29 11:02:44 +02:00
Jim LAURIE
bfc12662a2
Merge pull request #1836 from strapi/lauriejim-patch-1
Update alpha.14 in doc
2018-08-29 10:07:19 +02:00
Jim LAURIE
627c0b315d
Update alpha.14 in doc 2018-08-29 10:06:26 +02:00
Jim LAURIE
b31c2b5575
Merge pull request #1572 from yummyelin/master
Specify upload-file field's directory and mime type
2018-08-28 20:40:59 +02:00
Jim LAURIE
b5a41534f2
Merge branch 'master' into master 2018-08-28 20:40:36 +02:00
Nick Verwymeren
bd840d709e
Change comparison operator for array of id's
When there's an array of ID's present it looks like the Content Manager uses the '=' comparison which ends up returning an empty set. I think maybe the issue lies with the Content Manager plugin in that it should be using a 'IN' comparison if it detects an array. This is a workaround that seems to fix the issue. Although I'll be honest, I don't have enough knowledge of this plugin or the system to know if this will work for all edge cases.
2018-08-28 14:30:05 -04:00
Jim LAURIE
b7e2d41937
Merge pull request #1796 from nobodywithbody/fix/multiple-files-cancel
Discard action if canceled select file
2018-08-28 19:55:03 +02:00
Jim LAURIE
4913d5df74
Merge branch 'master' into fix/multiple-files-cancel 2018-08-28 19:54:05 +02:00
sundaycrafts
6fd5e50347 Merge branch 'master' into strapi-support-srv-uri 2018-08-29 01:49:54 +09:00
sundaycrafts
ac38aaa410 beautify mongoose hook lib/index.js 2018-08-29 01:33:58 +09:00
Jim LAURIE
e1d696ad2c
Merge pull request #1825 from strapi/update/generate-plugin
Add missing translations files
2018-08-28 18:23:16 +02:00
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