yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-09 17:26:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,877 Commits 115 Branches 488 Tags
Commit Graph

5877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joshua F. Rountree
aa6d222a51
Added white-space: nowrap; to buttons. 
Buttons are wrapping like crazy all over the app.
Let me know if this isn't the place to put this.
 2018-07-29 15:36:40 -04:00
DMehaffy
a2aefab312 Merge remote-tracking branch 'strapi/master' into discordProvider 2018-07-29 12:30:41 -07:00
Jim LAURIE
b29e03d032 Patch security command injection 2018-07-29 19:30:55 +02: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
Kamal Bennani
1ff336dae4
Add some documentation 2018-07-29 15:02:20 +02:00
Kamal Bennani
c729b8381f
send method doesn't get copied when using object.assign 2018-07-29 15:01:54 +02: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
Kamal Bennani
0514521707
Make sure that the aggregation queries are only generated for models that uses Mongoose as ORM 2018-07-29 13:24:20 +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
David Thomas
2113384e70
Merge branch 'master' into auth-microsoft 2018-07-28 15:14:25 -04:00
soupette
54aef15b75 Handle add attr logic 2018-07-27 17:24:58 +02: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
soupette
be73140600 Use toggle and fix editPage render loop 2018-07-27 16:15:26 +02:00
soupette
43cfa8a3a3 Change checkbox to toggle 2018-07-27 15:56:38 +02:00
soupette
34b7737a64 Set Manager in helper plugin 2018-07-27 15:33:37 +02:00
soupette
d7b12f1871 Merge branch 'master' of github.com:strapi/strapi into settings-ctm-edit-view 2018-07-27 12:19:19 +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
soupette
bf0619a6d4 Fix begining drag sort 2018-07-26 19:27:27 +02: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
Basile Bong
f0b8b411e6 Add > DE translation keys > strapi-plugin-email 2018-07-26 16:38:33 +02:00
Basile Bong
c2b34db19e Add > DE translation keys > strapi-plugin-content-type-builder 2018-07-26 16:34:36 +02:00
Jim LAURIE
a0c49e3340 Fix package conflicts 2018-07-26 16:19:28 +02:00
Jim LAURIE
09a2a4b73d 3.0.0-alpha.13.0.1 v3.0.0-alpha.13.0.1 2018-07-26 16:12:17 +02:00
Basile Bong
25e32a5459 Add > DE translation keys > strapi-plugin-content-manager 2018-07-26 15:55:30 +02:00