Jim LAURIE
1510774eaf
Merge pull request #1354 from zhuang17/fix-language-load
...
Fix language loading, first try load full user language code
2018-06-11 22:33:57 +02:00
Jim LAURIE
841c91d681
Merge branch 'master' into fix-language-load
2018-06-11 22:18:52 +02:00
Jim LAURIE
d063d12c7c
Merge pull request #1360 from strapi/fix-provider-role
...
Set default Role to authenticated when using a custom provider
2018-06-11 19:59:21 +02:00
Jim LAURIE
a3f6a32865
Merge branch 'master' into fix-provider-role
2018-06-11 19:39:10 +02:00
Jim LAURIE
414cb9dc4a
Merge pull request #1346 from strapi/fix-filters
...
Remove unappropriate filters according to field type
2018-06-11 19:30:11 +02:00
Jim LAURIE
98f9c0f61e
Merge branch 'master' into fix-filters
2018-06-11 19:06:43 +02:00
Jim LAURIE
fb9ba64462
Merge pull request #1313 from johannpinson/patch-builder-enum
...
Add Enumeration type to content type builder
2018-06-11 19:03:28 +02:00
soupette
10cc2f813e
Handle nav with keyboard in popup choose relation
2018-06-11 19:01:01 +02:00
Jim LAURIE
0a759bc3f2
Merge branch 'master' into patch-builder-enum
2018-06-11 18:26:12 +02:00
Jim LAURIE
e62c7c2a11
Merge pull request #1342 from strapi/fix-1269
...
Fix bug when deleting a relation that has the same field on both sides
2018-06-11 17:59:35 +02:00
Aurelsicoko
ddc1258429
Merge branch 'ctm-search' of github.com:strapi/strapi into ctm-search
2018-06-11 17:58:56 +02:00
Aurelsicoko
3dd2615c98
Remove unnecessary padding on List container
2018-06-11 17:56:39 +02:00
Aurelsicoko
be87950148
Add new icon and update CSS to follow the original design
2018-06-11 17:52:40 +02:00
Jim LAURIE
9dc8670740
Merge branch 'master' into fix-count
2018-06-11 17:39:15 +02:00
Jim LAURIE
d588a54729
Merge branch 'master' into fix-1269
2018-06-11 17:19:45 +02:00
soupette
47d6e2c743
Add minus to bulk actions
2018-06-11 17:04:20 +02:00
Jim Laurie
6b7f4c23a9
Remove useless code from upload plugin
2018-06-11 16:55:04 +02:00
Jim LAURIE
6ca62ee492
Merge pull request #1336 from DanielRuf/chore/test-against-nodejs-8-10
...
chore: test against Node.js 9 and 10
2018-06-11 16:30:57 +02:00
soupette
ae51f39c62
Fix default role when login with custom providers
2018-06-11 16:08:43 +02:00
Jim LAURIE
5838d19f81
Merge branch 'master' into chore/test-against-nodejs-8-10
2018-06-11 15:39:20 +02:00
Daan De Deckere
732038593f
Use type ID for primary key instead of String.
...
Fixes #1356 .
2018-06-09 22:03:53 +02:00
Daniel Ruf
24750caea2
chore: only test Node.js 9 and 10
2018-06-09 21:27:31 +02:00
Jim Laurie
892f4e3626
Fix setup links
2018-06-09 13:51:48 +02:00
Jim LAURIE
ee772c013e
Merge branch 'master' into master
2018-06-09 13:50:22 +02:00
Zhuang
66f273d673
fix language loading, first try load user language config, and then try load short user language code
2018-06-09 19:20:25 +08:00
Jim Laurie
e773d5d0d0
Fix route count
2018-06-08 22:52:41 +02:00
Jim LAURIE
92a3c453b7
Merge pull request #1338 from strapi/change-stm-link
...
Move settings-manager to configuration section
2018-06-08 21:01:22 +02:00
Kamal Bennani
4920c1fa76
Set the entry type only when the value is defined
2018-06-08 20:27:45 +02:00
Jim LAURIE
fd69eff50c
Merge branch 'master' into change-stm-link
2018-06-08 20:20:41 +02:00
Johann Pinson
e215c70bbc
Merge branch 'master' into patch-graphql-enum
2018-06-08 19:43:29 +02:00
Johann Pinson
ac49805641
refactor(graphql): improve codebase array function + remove useless string template
2018-06-08 19:43:10 +02:00
Jim LAURIE
88b95bbeed
Merge pull request #1295 from strapi/fix-1262
...
Use suggested content type names when setting relations
2018-06-08 19:05:58 +02:00
Jim LAURIE
7e60299e43
Merge branch 'master' into fix-1262
2018-06-08 17:33:28 +02:00
Jim LAURIE
7236623359
Merge pull request #1309 from nurikabe/patch-2
...
Left-align form labels in Edge
2018-06-08 17:33:15 +02:00
Jim LAURIE
6af48e7622
Merge branch 'master' into patch-2
2018-06-08 17:15:17 +02:00
Jim LAURIE
04045f1977
Merge pull request #1335 from johannpinson/patch-6
...
Upgrade version to fix history bug on GraphQL Playground
2018-06-08 17:14:56 +02:00
Aurelsicoko
fd47843b10
Get right global root path
2018-06-08 17:02:37 +02:00
ekamgit
6c3216cf51
Update hooks structure requirements
...
The current hooks structure has package.json within the lib folder. This causes strapi to fail as it is looking for the package.json file in the hook root folder and not within lib.
This change moves the secondary files back into the hook root leaving only index.js in the lib folder.
2018-06-08 23:05:48 +10:00
cyril lopez
6403df2960
Merge branch 'master' into bulk-actions
2018-06-08 12:21:11 +02:00
soupette
e6fafed2c2
Remove unappropriate filters
2018-06-08 12:19:04 +02:00
Kamal Bennani
e9fc37d03a
Add comment to handle fields of type array
2018-06-08 02:39:52 +02:00
Kamal Bennani
b85baf568e
use default format for fields of type string and text
2018-06-08 02:38:32 +02:00
Kamal Bennani
a8da79c6f8
Place the break in the correct place
2018-06-08 02:37:56 +02:00
Kamal Bennani
ec1872b031
Do not format value of type array and object because it will turn to zero
2018-06-08 02:37:24 +02:00
soupette
4d7b7fa1e0
Fixes #1269
2018-06-07 19:33:25 +02:00
soupette
7545afd28a
Fix PR feedback
2018-06-07 19:13:17 +02:00
soupette
84fb1fda1c
Fix conflicts
2018-06-07 18:54:40 +02:00
soupette
d716888296
Search with mongoose
2018-06-07 18:50:43 +02:00
Aurelsicoko
abc8395f2d
Handle count for search query
2018-06-07 17:24:09 +02:00
Aurelsicoko
60e0c6dcdb
Generate GIN indexes for Postgres database and handle search query
2018-06-07 17:16:19 +02:00
