Jim LAURIE
|
546f389746
|
Merge pull request #2119 from strapi/fix/2011
Fix plugin install version
|
2018-10-13 18:51:43 +01:00 |
|
Jim LAURIE
|
a21dba22c6
|
Merge branch 'master' into fix/2011
|
2018-10-13 18:50:44 +01:00 |
|
Daniel Król
|
fb7e9c2a8f
|
Add missing PL translations
|
2018-10-13 10:49:36 +02:00 |
|
Ben Weller
|
1249909c46
|
re-add support for JSON graphql types
|
2018-10-12 13:29:18 -05:00 |
|
grigoris
|
262a024c21
|
fix bug delete file from aws s3
this code fixed by #1992
|
2018-10-12 18:43:58 +03:00 |
|
Sylvain Girard
|
359eeaddfb
|
Update deployment.md
|
2018-10-11 20:51:47 +02:00 |
|
Jim LAURIE
|
9b1c2c2b0d
|
Merge pull request #2121 from strapi/fix-wysiwyg-warnings
Fix warning for controlled input without onChange handler in WYSIWYG
|
2018-10-11 14:20:57 +02:00 |
|
Jim LAURIE
|
d24db0dbca
|
Merge branch 'master' into fix-wysiwyg-warnings
|
2018-10-11 14:20:38 +02:00 |
|
Jim LAURIE
|
e1621ebd62
|
Merge pull request #2113 from strapi/enhancement/remove-mongo-recommended
Remove recommended for mongo database
|
2018-10-11 12:02:19 +02:00 |
|
Jim LAURIE
|
0bef8851ba
|
Merge branch 'master' into enhancement/remove-mongo-recommended
|
2018-10-11 12:02:00 +02:00 |
|
cyril lopez
|
2a8ef807d0
|
Fix PR feedback
|
2018-10-10 15:54:26 +02:00 |
|
cyril lopez
|
baae144799
|
Fix warning for controlled input without onChange handler in WYSIWYG
|
2018-10-10 14:56:21 +02:00 |
|
Jim LAURIE
|
c5df8f1608
|
Merge pull request #2025 from strapi/improve/admin-auth
Improve admin auth redirection
|
2018-10-10 11:51:09 +02:00 |
|
Jim LAURIE
|
badf6898ad
|
Fix plugin install version
|
2018-10-10 11:38:23 +02:00 |
|
cyril lopez
|
d45a4378ed
|
Merge branch 'master' into improve/admin-auth
|
2018-10-10 10:56:08 +02:00 |
|
NickBolles
|
2458dc6bf0
|
Merge branch 'njb/add-me-graphql-query' of https://github.com/NickBolles/strapi into njb/add-me-graphql-query
|
2018-10-09 21:06:55 -05:00 |
|
NickBolles
|
df9f6d6aee
|
add graphql query for the current user
|
2018-10-09 21:05:13 -05:00 |
|
NickBolles
|
cf7589ce62
|
add graphql query for the current user
|
2018-10-09 20:06:52 -05:00 |
|
Jim LAURIE
|
be32322b86
|
Merge pull request #2038 from MartinMuzatko/docs
Update Docs to Vuepress
|
2018-10-09 16:02:32 +02:00 |
|
Jim LAURIE
|
cd6e1a45fe
|
Add missing assets
|
2018-10-09 15:55:48 +02:00 |
|
Jim LAURIE
|
b9bf30f8b5
|
Fix conflict
|
2018-10-09 15:35:21 +02:00 |
|
cyril lopez
|
fff21e8afb
|
Fixes #1856 #1233
|
2018-10-09 15:17:43 +02:00 |
|
cyril lopez
|
977e1b309e
|
Fixes #2097
|
2018-10-09 14:55:31 +02:00 |
|
Jim LAURIE
|
d87c9bde33
|
Remove recommended for mongo database
|
2018-10-09 14:41:56 +02:00 |
|
Martin Muzatko
|
b1b78edb6d
|
fixed redirect and added correct metadata
|
2018-10-09 14:35:02 +02:00 |
|
Jim LAURIE
|
5705158a43
|
Merge pull request #2069 from strapi/improve-ctm/delete-edit-view
Add delete button in Edit view
|
2018-10-09 12:36:44 +02:00 |
|
Jim LAURIE
|
5f2582be39
|
Merge branch 'master' into improve-ctm/delete-edit-view
|
2018-10-09 12:34:37 +02:00 |
|
Jim LAURIE
|
bcb71242a8
|
Revert "Font-family declarations fixed"
|
2018-10-09 12:31:16 +02:00 |
|
Jim LAURIE
|
2273ba3e46
|
Merge pull request #2099 from strapi/fix/1483
Fix deep delete relation for oneWay and when there is no relations
|
2018-10-09 12:25:18 +02:00 |
|
Jim LAURIE
|
3f15b07aa0
|
Merge branch 'master' into fix/1483
|
2018-10-09 12:25:07 +02:00 |
|
cyril lopez
|
211a3fd568
|
Fix import showNotification
|
2018-10-09 12:06:20 +02:00 |
|
cyril lopez
|
13f2193f73
|
Merge branch 'improve-ctm/delete-edit-view' of github.com:strapi/strapi into improve-ctm/delete-edit-view
|
2018-10-09 12:02:25 +02:00 |
|
cyril lopez
|
d186d33e39
|
Revert "Fix font-family"
This reverts commit 220fb2caf8f8ca46ffff5646d62c3adc62c69819.
|
2018-10-09 11:49:16 +02:00 |
|
ByoungYong Kim
|
f683da78ec
|
Fixed lint errors that I didn't put semi-colons
|
2018-10-09 11:23:25 +02:00 |
|
Martin Muzatko
|
8e727b18c5
|
cleanup of dist and added docs dist to gitignore
|
2018-10-09 09:55:41 +02:00 |
|
takeshi_matsushita
|
136f973462
|
Update ja.json
|
2018-10-09 08:01:54 +09:00 |
|
takeshi_matsushita
|
930d0170f9
|
Add ja.json
|
2018-10-09 07:49:55 +09:00 |
|
Jim LAURIE
|
40a3c0418d
|
Merge branch 'master' into improve-ctm/delete-edit-view
|
2018-10-08 20:07:22 +02:00 |
|
ByoungYong Kim
|
94aa36bd20
|
Merge branch 'master' into fix/sso-not-working-in-the-wild
|
2018-10-08 18:39:12 +02:00 |
|
ByoungYong Kim
|
c6ee00003f
|
Revert "Fixed that protocol was hardcoded as 'http' and couldn't be configured regarding sso."
This reverts commit 17d5e295b53953a97fb5636ba8f373d7ff60a4fe.
|
2018-10-08 18:37:24 +02:00 |
|
cyril lopez
|
5c391f49e4
|
Merge branch 'master' of github.com:strapi/strapi into improve/admin-auth
|
2018-10-08 17:50:13 +02:00 |
|
Jim LAURIE
|
53391a5096
|
Merge pull request #2019 from strapi/split-admin-dev
Split Admin entry point between prod and dev
|
2018-10-08 17:45:07 +02:00 |
|
Jim LAURIE
|
4dd93f4b78
|
Merge branch 'master' into split-admin-dev
|
2018-10-08 17:44:35 +02:00 |
|
Jim LAURIE
|
8a325bf536
|
Merge pull request #2103 from strapi/3.0.0-alpha.14.3
3.0.0-alpha.14.3
|
2018-10-08 17:44:12 +02:00 |
|
Jim LAURIE
|
87c3af3d1e
|
3.0.0-alpha.14.3
v3.0.0-alpha.14.3
|
2018-10-08 17:14:19 +02:00 |
|
Aurelsicoko
|
72e47dde75
|
Update delete button style
|
2018-10-08 16:45:24 +02:00 |
|
ByoungYong Kim
|
17d5e295b5
|
Fixed that protocol was hardcoded as 'http' and couldn't be configured regarding sso.
|
2018-10-08 13:18:34 +02:00 |
|
ByoungYong Kim
|
4beab15bc3
|
Fixed that plugin-content-manager's bootstrap code mutates global models
|
2018-10-08 13:17:07 +02:00 |
|
ByoungYong Kim
|
12cc6d6039
|
Added provider into user model as it seems to be required for SSO.
|
2018-10-08 13:16:28 +02:00 |
|
Jim LAURIE
|
d586442fbd
|
Fix deep delete relation for oneWay and when there is no relations
|
2018-10-08 12:25:44 +02:00 |
|