yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-22 23:09:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,807 Commits 125 Branches 496 Tags
Commit Graph

14807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre BODIN
89e61ca6c7
Merge branch 'master' into bookshelf/fixEnumTemp 2020-03-04 09:08:42 +01:00
James Alvarez
975c01bcff Fix SelectWrapper stack order 
Signed-off-by: James Alvarez <jp@domainwink.com>
 2020-03-04 12:38:55 +08:00
Pouya Miralayi
8feea3e6ba
Merge branch 'master' into patch-4 2020-03-03 22:46:24 +03:30
soupette
467afcb7e6 Fix baseline 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-03 18:46:43 +01:00
Virginie Ky
5312035673 Merge branch 'develop' of github.com:strapi/strapi into front/media-library-filter 2020-03-03 17:49:41 +01:00
Virginie Ky
f266baa396 PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-03 17:49:30 +01:00
Pablo Rodríguez Caballero
e1549e7612
fix(EditViewDataManagerProvider): allow to reset number input 
Previously, deleting the numeric value from a number input would send an
empty string to the backend. The backend would convert that empty string
to 0, meaning that after setting a number, it would be impossible to
reset it to an empty field.

Signed-off-by: Pablo Rodríguez Caballero <pablo@rodriguezcaballero.me>
 2020-03-03 17:35:11 +01:00
Alexandre Bodin
70c336cfe9 Add tests and update old tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-03 16:41:37 +01:00
soupette
eaf210e081 Add dummy field API 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-03 16:40:02 +01:00
Alexandre Bodin
dd93ccd590 Init test for upload service 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-03 16:33:48 +01:00
Alexandre Bodin
e5b319d81e Update file creation process with fileInfo 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-03 16:33:48 +01:00
Alexandre Bodin
1dadf02e65 Merge branch 'develop' into features/media-lib 2020-03-03 16:33:33 +01:00
Alexandre Bodin
48697e26d9 Fix entity validator tests on error message format 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-03 16:33:20 +01:00
soupette
9f4757459b Rename InputFile 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-03 16:19:53 +01:00
Alexandre Bodin
5d2805bf14 Merge branch 'develop' into features/media-lib 2020-03-03 16:12:34 +01:00
Alexandre Bodin
01cda58cee Fix validation on update not allowing nulls 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-03 16:12:19 +01:00
Jim LAURIE
0f3fd09a1c
Merge pull request #5392 from strapi/docs-fix-titles 
Fix platform.sh steps titles
 2020-03-03 15:29:04 +01:00
Jim LAURIE
8136fcc68a docs: fix platformsh steps titles 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-03-03 15:27:01 +01:00
Jim LAURIE
3b791f75d8
Merge pull request #5376 from strapi/docs/faq 
Add FAQ and clean up users-permissions docs
 2020-03-03 15:07:53 +01:00
Virginie Ky
f50a5b1b66 Merge branch 'features/media-lib' of github.com:strapi/strapi into front/media-library-filter 2020-03-03 14:44:07 +01:00
Virginie Ky
aa628f3dc7 Merge branch 'features/media-lib' of github.com:strapi/strapi into front/img-preview 2020-03-03 14:41:40 +01:00
Derrick Mehaffy
d2931fb803
minor typo and grammar changes 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-03 03:38:09 -07:00
DMehaffy
3affef4226
Fix prettier doing stuff it shouldn't 2020-03-03 03:32:49 -07:00
Derrick Mehaffy
dc675ab1d6
merge faq page with new troubleshooting page. 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-03 03:25:29 -07:00
Derrick Mehaffy
a70b55eeaf
Add FAQ and modify create provider docs 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-03 03:18:02 -07:00
Jim LAURIE
b6facf00c4
Merge pull request #5281 from strapi/docs-v2 
Init new Getting Started documentation
 2020-03-03 11:15:43 +01:00
Jim LAURIE
c3010876c0
Merge branch 'master' into docs-v2 2020-03-03 11:12:05 +01:00
Jim LAURIE
b625cc4fad docs: fix pr feedback 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-03-03 11:11:17 +01:00
Alexandre Bodin
4b6220bffd Merge branch 'develop' into features/media-lib 2020-03-03 08:42:24 +01:00
Alexandre BODIN
6ab0f20f77
Merge pull request #5362 from robinv85/bugfix/rich-text-no-unique 
fix: don't show unique attribute for rich text fields #5305
 2020-03-02 23:20:22 +01:00
Virginie Ky
b634d557ea apply code review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-02 23:19:40 +01:00
Robin Venneman
6bfe1e84ed fix: don't show unique attribute for rich text fields #5305 
Signed-off-by: Robin Venneman <robin.venneman@gmail.com>
 2020-03-02 22:14:49 +01:00
cyril lopez
0cf132e914
Merge pull request #5384 from strapi/chore/upgrade-buffet 
Upgrade buffet.js
 2020-03-02 17:53:47 +01:00
Virginie Ky
abfc1d3287 Apply some PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-02 17:35:44 +01:00
soupette
21539f4a28 Upgrade buffet.js 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-02 17:27:32 +01:00
Alexandre BODIN
01115c074c
Merge pull request #5367 from MurzNN/patch-1 
Fix #5337 - suppress rewrite config in db without changes
 2020-03-02 17:09:22 +01:00
Alexandre BODIN
4c9e5b5185
Merge pull request #5358 from strapi/media-lib/provider-settings 
Media lib/provider settings
 2020-03-02 17:03:04 +01:00
Alexandre Bodin
27cf7f9077 Fix graphql upload size 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 16:46:47 +01:00
Alexandre Bodin
7ba6348149 Remove useless test 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 16:46:46 +01:00
Alexandre Bodin
924c45e9c0 Fix testing missing config 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 16:46:46 +01:00
Alexandre Bodin
b4e2554a5a Add doc to local and rackspace providers 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 16:46:45 +01:00
Alexandre Bodin
9159bb1c65 Migrate upload providers to new config system 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 16:46:44 +01:00
Alexandre Bodin
fd3511b511 Use strapi.plugins.upload.config for provider config 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 16:46:44 +01:00
Alexandre Bodin
d79053c6bc Remove file that was deleted in develop branch 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 16:46:25 +01:00
HichamELBSI
14120fd98b Fix single types modal title 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-02 15:50:15 +01:00
Derrick Mehaffy
cd87f0ed22
Fix enumeration on SQL databases 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-02 07:30:33 -07:00
Alexandre Bodin
7a8c865051 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 15:18:08 +01:00
virginieky
6186f1287a
Merge branch 'features/media-lib' into front/img-preview 2020-03-02 14:46:54 +01:00
Virginie Ky
ab6daa8cc6 clean 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-02 14:37:36 +01:00
Virginie Ky
e804824077 Card with checkbox 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-02 14:33:16 +01:00