Jim LAURIE
|
890db5970f
|
Merge pull request #1248 from raulriera/fix-typo
Fix a typo in the error key
|
2018-05-28 12:26:30 +02:00 |
|
Jim LAURIE
|
cd42dcded2
|
Merge branch 'master' into fix-typo
|
2018-05-25 18:09:03 +02:00 |
|
Jim LAURIE
|
2844d34ad1
|
Merge pull request #1266 from johannpinson/patch-graphql-timestamp
Change names for timestamp fields in GraphQL plugin
|
2018-05-25 16:46:54 +02:00 |
|
Jim LAURIE
|
e68bfba121
|
Merge branch 'master' into patch-graphql-timestamp
|
2018-05-25 16:24:22 +02:00 |
|
Jim LAURIE
|
40d5860d21
|
Merge pull request #1260 from johannpinson/patch-3
Fix generate GraphQL schema if ShadowCRUD is false
|
2018-05-24 19:26:13 +02:00 |
|
Jim LAURIE
|
93eb13e7dd
|
Merge branch 'master' into patch-3
|
2018-05-24 18:58:26 +02:00 |
|
Jim LAURIE
|
ab78d0a121
|
Merge pull request #1261 from johanbaath/fix-duplicate-permissions
Fix clean up of duplicate permissions
|
2018-05-24 18:58:09 +02:00 |
|
Jim LAURIE
|
b291cf1ab8
|
Merge branch 'master' into fix-duplicate-permissions
|
2018-05-24 18:48:05 +02:00 |
|
Jim LAURIE
|
88c598450c
|
Merge pull request #1245 from johannpinson/patch-2
Update Union type creation rules for GraphQL
|
2018-05-24 18:47:25 +02:00 |
|
Jim LAURIE
|
27d37f970f
|
Merge branch 'master' into patch-2
|
2018-05-24 18:37:54 +02:00 |
|
Johann Pinson
|
534fa00c0b
|
fix(graphql): change timestamp format snake_case to camelCase
|
2018-05-24 17:13:14 +02:00 |
|
Johann Pinson
|
e71063920f
|
Fix generate GraphQL schema if ShadowCRUD is false
|
2018-05-23 14:27:23 +02:00 |
|
Johan Baath
|
1cdb1dfc76
|
fix clean up of duplicate permissions
|
2018-05-23 14:25:32 +02:00 |
|
Jim LAURIE
|
acbf4581aa
|
Merge branch 'master' into fix-typo
|
2018-05-22 17:06:13 +02:00 |
|
Raul Riera
|
0e4c6064ce
|
Updated content type builder
|
2018-05-22 08:38:08 -04:00 |
|
Jim LAURIE
|
0a9fff5a30
|
Merge pull request #1249 from strapi/update-issue-template
Remove issue template checkbox
|
2018-05-22 14:17:12 +02:00 |
|
Jim Laurie
|
7056a6d65b
|
Remove issue template checkbox
|
2018-05-22 14:16:25 +02:00 |
|
Raul Riera
|
262182fd00
|
Fix a typo in the error key
|
2018-05-21 14:14:09 -04:00 |
|
Johann Pinson
|
330aac40ef
|
fix(graphql): update Union type creation rules
|
2018-05-21 15:39:45 +02:00 |
|
Johann Pinson
|
09cff64c5d
|
fix(graphql): update Union type creation rules
My PR is a:
🐛 Bug fix
Main update on the:
Plugin
Fix error type `Union type Morph can only include Object types, it cannot include [Enum name]`
|
2018-05-21 15:25:26 +02:00 |
|
Jim LAURIE
|
df87cc32c2
|
Merge pull request #1238 from yakupad/master
🇹🇷 update Turkish language translates
|
2018-05-21 10:25:20 +02:00 |
|
Yakup AD
|
58e4b27ddb
|
update Turkish language translates
|
2018-05-20 14:08:47 +03:00 |
|
Jim LAURIE
|
5e1a62b45b
|
Merge pull request #1229 from ertugrulungor/tr-language
🇹🇷 Update Turkish translations
|
2018-05-18 16:43:01 +02:00 |
|
Ertuğrul Üngör
|
05d8201476
|
Merge branch 'master' into tr-language
|
2018-05-18 15:46:39 +03:00 |
|
ertugrulungor
|
8a327c4cb6
|
Turkish translations
|
2018-05-18 15:41:18 +03:00 |
|
Jim LAURIE
|
6126645581
|
Merge pull request #1228 from strapi/lauriejim-patch-1
Remove prettier
|
2018-05-18 14:21:31 +02:00 |
|
Jim LAURIE
|
2393a6cef9
|
Remove prettier
Waiting for prettier indent fix
|
2018-05-18 14:21:05 +02:00 |
|
Jim LAURIE
|
b2fb8c9022
|
Merge pull request #1205 from strapi/add-prettier
Add prettier on pre-commit
|
2018-05-18 11:24:34 +02:00 |
|
Jim LAURIE
|
a64e19861f
|
Merge branch 'master' into add-prettier
|
2018-05-18 11:16:00 +02:00 |
|
Jim LAURIE
|
75ce8ea0be
|
Merge pull request #1196 from strapi/add-styled-component
Add styled-components
|
2018-05-18 11:15:41 +02:00 |
|
Jim LAURIE
|
74d3987a11
|
Merge branch 'master' into add-styled-component
|
2018-05-18 11:07:32 +02:00 |
|
Jim LAURIE
|
53e7c8f2cd
|
Merge pull request #1222 from johanbaath/fix-auth-redirect
Wait for the user plugin to bootstrap before redirection
|
2018-05-18 11:06:49 +02:00 |
|
Jim LAURIE
|
40cfa26c74
|
Merge branch 'master' into fix-auth-redirect
|
2018-05-18 10:57:40 +02:00 |
|
Jim LAURIE
|
b4ca0c88c5
|
Merge pull request #1223 from strapi/3.0.0-alpha.12.2
3.0.0-alpha.12.2
|
2018-05-18 10:53:21 +02:00 |
|
Johan Baath
|
7e6f7dcbf4
|
remove whitespace
|
2018-05-17 19:06:52 +02:00 |
|
Jim Laurie
|
31c0d7457a
|
3.0.0-alpha.12.2
v3.0.0-alpha.12.2
|
2018-05-17 16:54:27 +02:00 |
|
Johan Baath
|
bf0ac64b9c
|
wait for the user plugin to load before redirection
|
2018-05-17 16:11:13 +02:00 |
|
Jim LAURIE
|
39aeacb674
|
Merge pull request #1221 from strapi/fix-order-plugins
Fix order plugin upload
|
2018-05-17 16:06:07 +02:00 |
|
Jim Laurie
|
8addd7f000
|
Fix order plugin upload
|
2018-05-17 16:05:18 +02:00 |
|
Jim LAURIE
|
412bc1389f
|
Merge pull request #1219 from strapi/fix/design
Enhance & fix CSS
|
2018-05-17 15:37:53 +02:00 |
|
Jim LAURIE
|
a619f5c645
|
Merge branch 'master' into fix/design
|
2018-05-17 15:18:12 +02:00 |
|
Jim LAURIE
|
2d0661929c
|
Merge pull request #1220 from strapi/fix-poly-relation
Fix media relation update
|
2018-05-17 15:14:40 +02:00 |
|
Aurelsicoko
|
bcb81a928e
|
Remove layout.json & add it in .gitignore
|
2018-05-17 15:12:00 +02:00 |
|
Aurelsicoko
|
d816e5b313
|
Hide divider on hover
|
2018-05-17 15:05:53 +02:00 |
|
Jim Laurie
|
5175ee6336
|
Fix media relation update
|
2018-05-17 14:56:53 +02:00 |
|
Aurelsicoko
|
9c8d87a8fd
|
Remove log
|
2018-05-17 13:52:09 +02:00 |
|
Aurelsicoko
|
535e263203
|
Fix icons which were not displayed in list row
|
2018-05-17 13:44:32 +02:00 |
|
Aurelsicoko
|
818bbe8b78
|
Fix submit button newsletter
|
2018-05-17 13:39:42 +02:00 |
|
Aurelsicoko
|
4831610188
|
Fix toggle lang register page
|
2018-05-17 13:37:39 +02:00 |
|
Jim LAURIE
|
6b2e1f2bde
|
Merge pull request #1208 from strapi/fix-merge
Add missing requirement
|
2018-05-16 18:21:16 +02:00 |
|