5877 Commits

Author SHA1 Message Date
Jim LAURIE
9809972dc1
Merge pull request #1702 from strapi/fix-1395
Fix buggy content-type builder when uninstalling the file upload plugin
2018-08-21 08:59:05 +02:00
Jim LAURIE
515f04f41a
Merge branch 'master' into fix-1395 2018-08-21 08:58:54 +02:00
Jim LAURIE
815db512eb
Merge pull request #1728 from strapi/improvement/left-menu-links
Fix multi active left menu links
2018-08-21 08:58:00 +02:00
Jim LAURIE
4f2e0b639f
Merge branch 'master' into improvement/left-menu-links 2018-08-21 08:57:43 +02:00
Jim LAURIE
9651549207
Fix end line 2018-08-21 08:57:34 +02:00
Jim LAURIE
40f71912c3
Merge pull request #1720 from strapi/update-new-logs
Add upper first strapi new logs action
2018-08-21 08:56:58 +02:00
Jim LAURIE
f44ed33aa8
Merge branch 'master' into update-new-logs 2018-08-21 08:56:50 +02:00
Jim LAURIE
b48dbe09fd
Fix end line 2018-08-21 08:56:42 +02:00
Jim LAURIE
cf3a9d094a
Merge pull request #1731 from strapi/enhancement/home-admin
Send the user to the right section in the Quickstart tutorial
2018-08-21 08:55:30 +02:00
Jim LAURIE
21843d2650
Merge branch 'master' into enhancement/home-admin 2018-08-21 08:55:20 +02:00
Jim LAURIE
8707e49b75
Merge pull request #1730 from strapi/fix/rgpd
RGPD - Remove pre-checked checkbox
2018-08-21 08:55:00 +02:00
Daniel Ehrhardt
9fff06bad4 Fix #1761 GB MB 2018-08-20 22:11:50 +02:00
Alberto Maturano
1a3e01c66f Fix linter errors 2018-08-20 14:37:49 -05:00
soupette
f120413d26 Fixes 1741 2018-08-20 17:54:00 +02:00
Jim LAURIE
df49f3b8e8
Merge branch 'master' into fix/rgpd 2018-08-20 17:42:27 +02:00
Jim LAURIE
41ff4a84be
Merge pull request #1726 from strapi/enhancement/readme
Enhancement readme
2018-08-20 17:41:53 +02:00
Jim LAURIE
c1e9a24239
Merge branch 'master' into enhancement/readme 2018-08-20 17:41:40 +02:00
Jim LAURIE
c35a89466c
Merge pull request #1732 from strapi/fix/installed-plugins
Fix download display
2018-08-20 17:40:49 +02:00
Jim LAURIE
91b2cd9bf9
Merge branch 'master' into fix/installed-plugins 2018-08-20 17:22:10 +02:00
Jim LAURIE
2e09d33049
Merge pull request #1709 from jskorepa/fix-relation
Fix one to many relation querying in the other direction in graphql
2018-08-20 17:21:41 +02:00
Jim LAURIE
2ace38322d
Merge branch 'master' into fix/installed-plugins 2018-08-20 17:20:14 +02:00
soupette
ef59452b9a Fixes #1704 2018-08-20 17:13:05 +02:00
Jim LAURIE
d4341797a0
Merge branch 'master' into fix-relation 2018-08-20 16:32:13 +02:00
Jim LAURIE
f3fff0ef8b
Merge pull request #1682 from kuongknight/master
Make type of id configurable
2018-08-20 16:32:05 +02:00
Jim LAURIE
d9725a719d
Merge branch 'master' into master 2018-08-20 16:24:01 +02:00
Jim LAURIE
fb07e39a38
Merge pull request #1759 from Jan10/master
Update DE translations
2018-08-20 15:30:50 +02:00
Jim LAURIE
fbc98ed4bb
Merge branch 'master' into master 2018-08-20 15:30:41 +02:00
Aurelsicoko
238ce9dbf7 Enhance UX & CSS of displayed attributes box 2018-08-20 15:16:46 +02:00
Jim LAURIE
0f4b43eb63
Merge pull request #1705 from strapi/block-user
Can block a user
2018-08-20 15:02:56 +02:00
Aurelsicoko
4f16144ee9 Update & enhance CSS 2018-08-20 14:18:37 +02:00
Luca
e90791ef4c
Merge branch 'master' into fix/autoReload 2018-08-17 16:04:19 +02:00
Jonathan Lovera
83549e4ffd
Allow global policies to be organised in folders
Hi, 

I'm been using Strapi for a project I'm doing and you guys have done a great work! I love the idea.

This is a small Pull Request, however, I find it very useful if you would like to have your global policies organized by folders. Just in case you have more than 10 of them.

If you try at the moment to create a policy inside a folder, it will throw 
```
Cannot read property 'handler' of undefined
```

This will fix it and it will allow you to have folders on your `config/policies` folder.
2018-08-17 14:27:59 +10:00
Jan Brachhold
cef161bc28 Update DE translations - strapi-plugin-users-permissions 2018-08-16 14:34:27 +02:00
Jan Brachhold
2440a15eeb Update DE translations - strapi-plugin-upload 2018-08-16 14:34:13 +02:00
Jan Brachhold
dbc2a223c3 Update DE translations - strapi-plugin-content-manager 2018-08-16 14:33:55 +02:00
Jan Brachhold
95ce4091f7 Update DE translations - strapi-admin 2018-08-16 14:33:37 +02:00
Chris Dekker
96d1eeb70b Fix for issue https://github.com/strapi/strapi/issues/1589 2018-08-16 14:17:54 +02:00
soupette
475e93c9b9 Fix conflicts 2018-08-14 18:34:03 +02:00
soupette
9e191ebc8c Fix z-index 2018-08-14 18:29:59 +02:00
soupette
97673e77e2 Store displayed fields in localstorage 2018-08-14 18:26:53 +02:00
soupette
97ae4b7659 Display or hide field directy from the list view 2018-08-14 17:10:23 +02:00
soupette
7a0e216b9b Merge branch 'master' of github.com:strapi/strapi into settings-ctm-edit-view 2018-08-14 10:56:46 +02:00
KuongKnight
6ec3295ace updated document 2018-08-13 10:09:38 +07:00
sundaycrafts
6d006c4794 "new" command supports mongo +srv prefix uri 2018-08-13 05:43:42 +09:00
Jim LAURIE
de33749ec1
Merge branch 'master' into block-user 2018-08-10 15:50:09 +02:00
Jim LAURIE
17c2fe1d5c
Merge pull request #1700 from strapi/fix-1660
Fix z-index input file
2018-08-10 15:49:41 +02:00
Luca
784e330b23
Merge branch 'master' into fix/NODE_ENV 2018-08-10 13:29:04 +02:00
soupette
688defca70 Fix conflict 2018-08-10 12:52:11 +02:00
soupette
edf81024c1 Fix design 2018-08-10 12:45:56 +02:00
Jim LAURIE
9c17701163
Merge branch 'master' into block-user 2018-08-10 10:02:52 +02:00