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
Jim LAURIE
b02a3dbd38
Merge pull request #4190 from ivoba/de-fix-and-removed-spaces
...
Update DE translations
2019-10-10 18:53:56 +02:00
soupette
afda62d1ba
Update snapshots
2019-10-10 16:40:53 +02:00
Virginie Ky
ef1a3f56a5
clean
2019-10-10 16:27:18 +02:00
Virginie Ky
8040e89d7f
clean css and buttons ui
2019-10-10 16:21:32 +02:00
soupette
d1356fa3ea
Update plugin generators to add front-end files
2019-10-10 11:45:26 +02:00
soupette
3e7ee49154
Fixes #2149 #3016 #3471
2019-10-10 08:49:33 +02:00
cyril lopez
d1a6da5710
Merge branch 'master' into de-fix-and-removed-spaces
2019-10-10 08:33:46 +02:00
soupette
17607648f3
Add compression plugin
2019-10-10 07:13:15 +02:00
soupette
55b8a20a80
Add serviceworker and add option to skip the assets minization for faster build
2019-10-10 07:08:04 +02:00
soupette
0c6e146653
Fix conflicts
2019-10-10 06:36:31 +02:00
soupette
a27c8b2887
Merge branch 'develop' of github.com:strapi/strapi into front/remove-sass
2019-10-10 06:34:54 +02:00
soupette
beef6e5510
Fix conflicts
2019-10-10 06:34:31 +02:00
soupette
1e069d759e
Remove node-sass
2019-10-10 06:24:19 +02:00
soupette
e84beef88f
fix tests
2019-10-09 18:12:42 +02:00
soupette
8bd092eff7
Remove all scss files in helper plugin
2019-10-09 18:06:51 +02:00
Jim LAURIE
9b49bee4b4
Fix #549 forgot password url
2019-10-09 17:37:16 +02:00
soupette
77c94645e8
Remove scss files
2019-10-09 15:44:56 +02:00
Jim LAURIE
82aeed2a40
Review all the concept structure and content structure
2019-10-09 12:32:58 +02:00
soupette
62acc713c1
Init styled-compo migration in helper plugin
2019-10-09 12:31:36 +02:00
soupette
05a1e69888
Remove sass ctb
2019-10-09 12:00:52 +02:00
soupette
7e56dbb9c0
Remove scss in ctm
2019-10-09 10:55:48 +02:00
cyril lopez
6defb64be1
Merge pull request #4089 from strapi/front/remove-sass-admin
...
Remove sass admin
2019-10-08 17:06:12 +02:00
