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
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
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
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
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
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
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
DMehaffy
a2aefab312
Merge remote-tracking branch 'strapi/master' into discordProvider
2018-07-29 12:30:41 -07:00
Jim LAURIE
f8d5da71ac
Merge pull request #1662 from jfrux/patch-1
...
Update configurations.md
2018-07-29 17:27:26 +02:00
Jim LAURIE
538d7c82b4
Rename database name
2018-07-29 17:16:19 +02:00
Joshua F. Rountree
661cb8be7c
Update configurations.md
...
Minor typo in configurations.md in the documentation under postgres.
2018-07-29 11:07:57 -04:00
Jim LAURIE
179894c4c2
Merge pull request #1635 from strapi/fix/1609
...
Disconnect projects from marketplace.strapi.io
2018-07-29 14:35:03 +02:00
Jim LAURIE
3e956670a9
Merge branch 'master' into fix/1609
2018-07-29 14:25:49 +02:00
Jim LAURIE
fceeff74e0
Merge pull request #1653 from Velua/patch-2
...
updated version from alpha 12 to 13
2018-07-29 14:16:21 +02:00
Joao Bueno
9dd8706d09
Translation keys missing in PT-BR language (final cut) - Resolves #1625
2018-07-28 16:19:48 -03:00
Joao Bueno
721a14e3bf
Translation keys missing in PT-BR language - Resolves #1625
2018-07-28 16:15:45 -03:00
Basile Bong
3bc0742abe
Change > DE translation keys > use Inhaltstyp instead of Content-Typ
2018-07-27 17:14:45 +02:00
Basile Bong
f10064e06c
Change > DE translation keys > use familiar form
2018-07-27 17:05:44 +02:00
Marianelli Michele
f998c5cf96
Plugin users permission admin - ITA
2018-07-27 11:05:57 +02:00
John Williamson
b257324119
updated version
2018-07-27 13:22:33 +10:00
Jim LAURIE
96f83eb2b1
Merge pull request #1647 from strapi/3.0.0-alpha.13.0.1
...
3.0.0 alpha.13.0.1
2018-07-26 17:09:17 +02:00
Basile Bong
757875245c
Add > DE translation keys > strapi-plugin-users-permissions
2018-07-26 16:44:54 +02:00
Basile Bong
f2963b4eab
Add > DE translation keys > strapi-plugin-upload
2018-07-26 16:42:02 +02:00
Basile Bong
792040a959
Add > DE translation keys > strapi-plugin-settings-manager
2018-07-26 16:40:25 +02:00
