Plusb Preco
5eeb1aa5be
Merge branch 'korean-translation' of https://github.com/preco21/strapi into korean-translation
2018-08-01 00:10:10 +09:00
Plusb Preco
5902f41df8
Fix grammatical issue
2018-08-01 00:08:55 +09:00
Plusb Preco
9a0490bdda
Merge branch 'master' into korean-translation
2018-08-01 00:03:11 +09:00
Aurelsicoko
120f515e5e
Better design many-to-many and add jump link
2018-07-31 16:57:16 +02:00
Basile Bong
1d6f4c957b
Add > DE translation keys > strapi-plugin-content-manager
2018-07-31 16:55:43 +02:00
Plusb Preco
6fc7852cf1
Add missing translations and small grammatical fixes
2018-07-31 23:44:13 +09:00
Jim LAURIE
b2a9579442
Merge pull request #1664 from derrickmehaffy/discordProvider
...
Add Discord auth provider
2018-07-31 16:28:29 +02:00
Jim LAURIE
f559bcc82c
Merge branch 'master' into discordProvider
2018-07-31 16:18:04 +02:00
Jim LAURIE
44b3ae5f05
Update discord icon
2018-07-31 16:17:41 +02:00
Jim LAURIE
ca4f54151c
Merge pull request #1666 from strapi/fix-json-input
...
Fix json input that was sending undefined.
2018-07-31 15:36:09 +02:00
Jim LAURIE
d61ca192b0
Merge branch 'master' into fix-json-input
2018-07-31 15:26:21 +02:00
Jim LAURIE
d0732a6083
Merge pull request #1665 from strapi/fix-policies-generation
...
Fix multi API controller
2018-07-31 15:20:04 +02:00
Jim LAURIE
45671113e5
Merge branch 'master' into fix-policies-generation
2018-07-31 15:10:42 +02:00
soupette
043838ba3f
Handle added upload relations
2018-07-31 14:54:52 +02:00
Jim LAURIE
d4a832f6a6
Merge pull request #1416 from brocgailit/master
...
Implement sorting for SelectMany in Frontend
2018-07-31 14:34:08 +02:00
Jim LAURIE
0b8178fa71
Merge branch 'master' into master
2018-07-31 14:17:49 +02:00
Aurélien GEORGET
065792bea6
Update User.settings.json
2018-07-31 14:16:27 +02:00
Aurélien GEORGET
8386003e47
Update permissions.js
2018-07-31 14:15:53 +02:00
soupette
2d4dded100
Improve ctb by making the continue button the submit one
2018-07-31 13:59:30 +02:00
Jim LAURIE
97bc4dac11
Merge pull request #1654 from mikmar88/patch-3
...
Update IT translations
2018-07-31 13:53:35 +02:00
Jim LAURIE
6ec8c627c0
Merge branch 'master' into patch-3
2018-07-31 13:53:29 +02:00
DMehaffy
fb0e848ee0
Merge branch 'master' into discordProvider
2018-07-31 04:52:54 -07:00
Jim LAURIE
b8942ccd1d
Merge pull request #1659 from jbbn/translation-resolves-1625
...
Update PT-BR translations
2018-07-31 13:45:04 +02:00
Jim LAURIE
8930e2a072
Merge branch 'master' into translation-resolves-1625
2018-07-31 13:44:55 +02:00
Jim LAURIE
7da9fef916
Merge pull request #1649 from basilebong/translation/de
...
Added missing translation keys in DE language
2018-07-31 13:42:58 +02:00
Jim LAURIE
a66c3d8eb0
Merge branch 'master' into translation/de
2018-07-31 13:42:51 +02:00
Jim LAURIE
37f9f2b02a
Merge pull request #1640 from bardaq/translation-keys-ru
...
Update RU translations
2018-07-31 13:41:30 +02:00
Jim LAURIE
a912976282
Merge branch 'master' into translation-keys-ru
2018-07-31 13:41:23 +02:00
Jim LAURIE
ac6dadddba
Merge pull request #1638 from maturano/feature/spanishTranslation
...
Update ES translations
2018-07-31 13:38:24 +02:00
Jim LAURIE
ba99e0f24d
Merge branch 'master' into feature/spanishTranslation
2018-07-31 13:38:18 +02:00
Jim LAURIE
641cdda790
Merge pull request #1634 from moersoy/master
...
Update TR translations
2018-07-31 13:37:34 +02:00
Jim LAURIE
6666444f48
Merge branch 'master' into master
2018-07-31 13:37:20 +02:00
soupette
ac382484b3
Fix path for advanced settings
2018-07-31 13:33:45 +02:00
Jim LAURIE
5cf5d2f60b
Merge pull request #1633 from mikmar88/patch-2
...
Another update of it.json
2018-07-31 13:33:43 +02:00
Jim LAURIE
2b0f2d23cb
Merge branch 'master' into patch-2
2018-07-31 13:33:35 +02:00
Jim LAURIE
019eb171c0
Merge pull request #1632 from mikmar88/patch-1
...
Update it.json
2018-07-31 13:33:05 +02:00
Jim LAURIE
395111170f
Merge branch 'master' into patch-1
2018-07-31 13:32:42 +02:00
DMehaffy
3b0cdcc708
Add Discord example link
2018-07-31 03:40:05 -07:00
soupette
aa343f4af3
Add custom drag layer
2018-07-30 19:08:13 +02:00
Aurélien GEORGET
72274cb3ff
Merge branch 'master' into master
2018-07-30 16:38:32 +02:00
Aurelsicoko
d8e5d0403b
Update design, behavior and add link for selectMany
2018-07-30 16:33:50 +02:00
soupette
3db2cc1ca1
Merge branch 'master' of github.com:strapi/strapi into settings-ctm-edit-view
2018-07-30 14:40:05 +02:00
soupette
11edb99900
Fix dup key in Manager.js
2018-07-30 14:38:10 +02:00
soupette
6bf3ddeea9
Update displayed fields when removing a field from the content type builder
2018-07-30 13:59:25 +02:00
soupette
7847c8eb0a
Fix json input that was sending undefined.
...
The error was caused by a wrong path since the schema object has been changed
2018-07-30 11:27:18 +02:00
Aurélien GEORGET
3b4a604ee0
Apply users-permissions policy on the admin routes
2018-07-30 10:53:44 +02:00
Jim LAURIE
bc3e756e6e
Fix multi API controller
2018-07-30 10:10:43 +02:00
DMehaffy
b8adba1e23
Finish adding Discord to Providers.js
...
Thanks to synth3tk for your help!
Note that with Discord the username is not unique so I combined the username and discriminator in order to store a unique "username"
2018-07-29 17:43:45 -07:00
Joshua F. Rountree
6eba67a1d0
Fixes height of buttons.
2018-07-29 15:46:46 -04:00
Joshua F. Rountree
89b0fdeecb
Fixes admin buttons for links
2018-07-29 15:45:08 -04:00
