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 |
|
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 |
|
Martin Muzatko
|
8e727b18c5
|
cleanup of dist and added docs dist to gitignore
|
2018-10-09 09:55:41 +02:00 |
|
Jim LAURIE
|
40a3c0418d
|
Merge branch 'master' into improve-ctm/delete-edit-view
|
2018-10-08 20:07:22 +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 |
|
Jim LAURIE
|
d586442fbd
|
Fix deep delete relation for oneWay and when there is no relations
|
2018-10-08 12:25:44 +02:00 |
|
Jim LAURIE
|
ebd60f93cc
|
Merge pull request #2096 from strapi/fix/1077
Fix numerical 0 display in data list
|
2018-10-08 11:54:56 +02:00 |
|
Jim LAURIE
|
9f67701183
|
Merge branch 'master' into fix/1077
|
2018-10-08 11:54:46 +02:00 |
|
Jim LAURIE
|
b0f4f004d8
|
Merge pull request #2079 from maturanomx/bug/minorChanges
Minor changes and bug fixes
|
2018-10-08 11:20:11 +02:00 |
|
cyril lopez
|
9ce27ae3d8
|
Clean svg
|
2018-10-08 11:20:04 +02:00 |
|
Jim LAURIE
|
dfee8052de
|
Merge branch 'master' into bug/minorChanges
|
2018-10-08 11:20:03 +02:00 |
|
Jim LAURIE
|
7ceeed4d10
|
Merge pull request #2075 from strapi/update/2071
Fix typo update service on bookshelf
|
2018-10-08 11:19:36 +02:00 |
|
Jim LAURIE
|
43dfafd181
|
Merge branch 'master' into update/2071
|
2018-10-08 11:19:28 +02:00 |
|
Jim LAURIE
|
99ce46f6bb
|
Delete path on save in sql column generator
|
2018-10-08 10:40:28 +02:00 |
|
Jim LAURIE
|
021fd9f885
|
Merge pull request #2094 from mleko-forks/translate/pl-email-and-settings-manager
Update PL translations
|
2018-10-08 09:52:28 +02:00 |
|
Daniel Król
|
79c1e9a95c
|
Merge branch 'translate/pl-content-manager' into translate/pl-email-and-settings-manager
|
2018-10-07 20:33:37 +02:00 |
|
Jim LAURIE
|
35b94db32e
|
Fix numerical 0 display in data list
|
2018-10-07 19:36:51 +02:00 |
|
Daniel Król
|
6642c640bf
|
Add missing translations
|
2018-10-07 19:27:22 +02:00 |
|
Daniel Król
|
d2beb2732d
|
Merge branch 'master' into translate/pl-email-and-settings-manager
|
2018-10-07 19:12:43 +02:00 |
|
Daniel Król
|
540d5571ab
|
Add missing translations for 2 plugins
|
2018-10-07 19:03:05 +02:00 |
|
Jim LAURIE
|
d8a2c9a833
|
Merge pull request #2091 from endymion1818/patch-1
Add instructions for cloning locally from Heroku
|
2018-10-07 17:30:09 +02:00 |
|
Jim LAURIE
|
6dd38bc732
|
Merge branch 'master' into patch-1
|
2018-10-07 17:29:19 +02:00 |
|
Jim LAURIE
|
d1ae57a7cb
|
Merge pull request #2085 from devaublanc/master
Fix error on fetch permissions
|
2018-10-07 17:00:50 +02:00 |
|
Jim LAURIE
|
5684700a72
|
Merge branch 'master' into master
|
2018-10-07 17:00:42 +02:00 |
|