5430 Commits

Author SHA1 Message Date
Jim LAURIE
8e39fca71f
Merge pull request #1775 from maturano/fixLinterErrors
Fix linter errors
2018-08-21 11:45:55 +02:00
Jim LAURIE
5d6da451fc
Merge branch 'master' into fixLinterErrors 2018-08-21 11:43:52 +02:00
Jim LAURIE
459443dfa7
Merge pull request #1773 from strapi/fix-it-users-permissions
Load it translations for users-permissions plugin
2018-08-21 11:40:37 +02:00
Jim LAURIE
ed3f7d9018
Merge branch 'master' into fix-it-users-permissions 2018-08-21 11:40:31 +02:00
Jim LAURIE
82481601f2
Merge pull request #1757 from chrisdekker1997/master
Fix email template forgot password
2018-08-21 11:38:51 +02:00
Jim LAURIE
e97fa20ba3
Merge branch 'master' into master 2018-08-21 11:25:22 +02:00
Jim LAURIE
602229df27
Merge pull request #1407 from kamalbennani/feature/graphql-aggregation
GraphQL Aggregation Feature
2018-08-21 10:53:30 +02:00
Jim LAURIE
4bf88f8792
Merge branch 'master' into feature/graphql-aggregation 2018-08-21 10:36:09 +02:00
Jim LAURIE
60a42b1f03
Merge pull request #1663 from jfrux/patch-2
This is for style updates to the admin panel.
2018-08-21 09:46:16 +02:00
Jim LAURIE
62c458741d
Merge branch 'master' into patch-2 2018-08-21 09:46:09 +02:00
Jim LAURIE
e4c9b00b04
Merge pull request #1711 from strapi/fix/NODE_ENV
Fix process node env
2018-08-21 09:25:44 +02:00
Jim LAURIE
9f9a84fd3e
Merge branch 'master' into fix/NODE_ENV 2018-08-21 09:07:24 +02:00
Jim LAURIE
344db51cbc
Merge pull request #1719 from strapi/improvement/content-type-autofocus
Autofocus name when creating a new Content Type
2018-08-21 09:06:29 +02:00
Jim LAURIE
cef51dd9b0
Merge branch 'master' into improvement/content-type-autofocus 2018-08-21 09:06:21 +02:00
Jim LAURIE
9b70fb8d4b
Merge pull request #1717 from strapi/improvement/remember-me
Tick remember me by default
2018-08-21 09:00:52 +02:00
Jim LAURIE
ef97f72ff7
Merge branch 'master' into improvement/remember-me 2018-08-21 09:00:41 +02:00
Jim LAURIE
5645bb7c31
Fix end line 2018-08-21 09:00:33 +02:00
Jim LAURIE
6e6f5568c9
Merge pull request #1721 from strapi/improvement/database-name
Change default database name
2018-08-21 08:59:46 +02:00
Jim LAURIE
6ebc8b1d0e
Merge branch 'master' into improvement/database-name 2018-08-21 08:59:36 +02:00
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
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
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
Jim LAURIE
0f4b43eb63
Merge pull request #1705 from strapi/block-user
Can block a user
2018-08-20 15:02:56 +02: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