soupette
9b0dda7e72
Fix PR feedback
2019-10-15 12:05:08 +02:00
Jim LAURIE
bd323c7cae
Fix typo
2019-10-15 12:03:03 +02:00
Jim LAURIE
5ddb32222b
Apply PR feedback
2019-10-15 11:56:13 +02:00
Jim LAURIE
6fcbec8645
Merge pull request #4243 from forethoughtde/master
...
Update DE translation
2019-10-15 11:39:13 +02:00
Alexandre BODIN
fff17678fb
Merge branch 'develop' into update/plugin-generators
2019-10-15 11:25:45 +02:00
Alexandre BODIN
0055b236a9
Merge pull request #4227 from strapi/front/fix-ctb-issues
...
Add reserved content type names
2019-10-15 11:25:30 +02:00
Jim LAURIE
38d08e216c
Merge branch 'master' into master
2019-10-15 11:14:42 +02:00
soupette
4c115ca34d
Merge branch 'front/fix-ctb-issues' of github.com:strapi/strapi into update/plugin-generators
2019-10-15 08:17:33 +02:00
cyril lopez
882f467018
Merge branch 'develop' into front/fix-ctb-issues
2019-10-15 08:16:56 +02:00
cyril lopez
d1e1c404e3
Merge branch 'develop' into update/plugin-generators
2019-10-15 07:42:04 +02:00
soupette
6ea77b69e5
Merge branch 'master' of github.com:strapi/strapi into develop
2019-10-15 07:40:55 +02:00
soupette
95548e0ca0
Merge branch 'front/fix-ctb-issues' of github.com:strapi/strapi into update/plugin-generators
2019-10-15 07:13:07 +02:00
soupette
7f747dbbb1
Merge branch 'develop' of github.com:strapi/strapi into front/fix-ctb-issues
2019-10-15 07:10:02 +02:00
soupette
ff849c0503
Fix conflicts
2019-10-14 17:03:18 +02:00
Alexandre BODIN
161aaaea10
Merge pull request #4226 from strapi/front/improve-webpack-config
...
Improve Webpack config
2019-10-14 16:50:51 +02:00
soupette
286de27309
Fix PR feedback
2019-10-14 16:46:35 +02:00
Jim LAURIE
41a84e3605
Merge pull request #4219 from strapi/doc-update/concepts
...
Review all the concept structure and content structure
2019-10-14 15:42:26 +02:00
Jim LAURIE
63fbfd59ab
Merge branch 'master' into doc-update/concepts
2019-10-14 14:16:46 +02:00
Jim LAURIE
069a8790be
Fix type
2019-10-14 13:47:41 +02:00
Jelmer Visser
5ee6332167
Escape MongoDB password ( #4231 )
...
* Encode MongoDB password if using srv url
* Always encode MongoDB password
2019-10-14 11:48:42 +02:00
Jelmer Visser
db91607dbc
Added share playground feature
2019-10-14 10:53:59 +02:00
soupette
983839f538
Change cli options
2019-10-14 10:51:25 +02:00
Jelmer Visser
16bd271eee
Fix for #3974 URIError appeared after entering % symbol into the Search input field ( #4236 )
2019-10-14 10:50:26 +02:00
Alexandre BODIN
656343d059
Disable reload on jwt.json creation ( #4246 )
2019-10-14 10:49:19 +02:00
cyril lopez
d96e2dae18
Merge pull request #4237 from strapi/fix/alignment
...
Fix/alignment
2019-10-14 08:56:46 +02:00
soupette
20e7e9fcc3
Fix padding
2019-10-14 08:32:37 +02:00
Karthikeyan Palaniswamy
f2f7d4f414
Add missing translation for Documentation plugin - Left menu link.
2019-10-13 01:51:03 +02:00
sven
47b7fab200
Fetch Github profile email if not found
...
When a Github user does not have a public email on his profile the
GitHub OAuth API will have `email` set to `null`. When the registered
OAuth application in Github has permission for the user:email scope it
is possible to get the user email via the `user/email` API endpoint.
This is similar to the `passport-github2` package.
See https://github.com/cfsghost/passport-github/blob/master/lib/strategy.js
2019-10-12 22:43:44 +02:00
sven
68cf8ab231
Fix return value type of providers.connect
...
Inside controllers/Auth.js:156 the return value is expected to
be [user, error].
This commit makes sure that providers.connnect()
will always resolve or reject with [user, error]
2019-10-12 22:35:39 +02:00
soupette
22d5a90e18
Merge branch 'update/plugin-generators' of github.com:strapi/strapi into fix/alignment
2019-10-11 15:58:50 +02:00
soupette
b459f3c0b0
Merge branch 'front/improve-webpack-config' of github.com:strapi/strapi into update/plugin-generators
2019-10-11 15:57:41 +02:00
soupette
bf84be65e1
Fix conflicts
2019-10-11 15:57:19 +02:00
soupette
b59351d375
Fix conflicts
2019-10-11 15:54:38 +02:00
Jim LAURIE
2c994c43f6
Merge pull request #4238 from strapi/fix/admin-dev
...
Fix webpack-dev-server dependency
2019-10-11 15:52:01 +02:00
soupette
9bb12c2e97
Fix webpack-dev-server dependency
2019-10-11 15:49:20 +02:00
Virginie Ky
94bf867c93
merge update plugin generators
2019-10-11 15:18:15 +02:00
Virginie Ky
c53f3672b1
merge
2019-10-11 15:16:51 +02:00
soupette
e8ebc71755
Change deps
2019-10-11 15:16:06 +02:00
soupette
ab89cc20d9
Merge branch 'update/plugin-generators' of github.com:strapi/strapi into update/plugin-generators
2019-10-11 15:14:09 +02:00
soupette
130a85f436
Merge branch 'front/improve-webpack-config' of github.com:strapi/strapi into update/plugin-generators
2019-10-11 15:13:40 +02:00
soupette
48bbda38bf
Fix deps
2019-10-11 15:11:55 +02:00
Virginie Ky
5b32e32758
Some UI fixes
2019-10-11 14:59:41 +02:00
cyril lopez
97b4764b16
Merge branch 'develop' into update/plugin-generators
2019-10-11 13:04:37 +02:00
cyril lopez
16e709dc42
Merge branch 'develop' into front/fix-ctb-issues
2019-10-11 13:04:14 +02:00
cyril lopez
096df7e549
Merge branch 'develop' into front/improve-webpack-config
2019-10-11 13:03:50 +02:00
soupette
f09422d524
Merge branch 'master' of github.com:strapi/strapi into develop
2019-10-11 13:03:14 +02:00
soupette
f0b230f0af
Merge branch 'develop' of github.com:strapi/strapi into front/fix-ctb-issues
2019-10-10 21:25:24 +02:00
soupette
4c48979dff
Merge branch 'front/improve-webpack-config' of github.com:strapi/strapi into update/plugin-generators
2019-10-10 21:22:12 +02:00
soupette
86932b2911
Merge branch 'develop' of github.com:strapi/strapi into front/improve-webpack-config
2019-10-10 21:20:02 +02:00
cyril lopez
650aa1e2da
Merge pull request #4223 from strapi/front/remove-sass
...
Remove scss in strapi-helper-plugin
2019-10-10 19:40:33 +02:00
