yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-08 00:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,206 Commits 113 Branches 488 Tags
Commit Graph

13206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre BODIN
b9d127d47c
Merge pull request #6079 from strapi/chore/password-not-required-on-edit 
Make password input optional while editing
 2020-05-07 11:01:12 +02:00
Alexandre Bodin
acbd7a231c Clean code 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-07 10:39:16 +02:00
cyril lopez
48d1a2bde2
Merge branch 'master' into IT_translation 2020-05-07 10:00:41 +02:00
Vanessa
022b228279
Fix issue #5934 - add path folder for thumbnail and breakpoints images (#6078) 
Signed-off-by: Lith <lith@amykron.com>
 2020-05-07 09:28:26 +02:00
Jim LAURIE
ee70c76609
Merge pull request #5844 from strapi/chore/moveToGHDisc 
Remove Stack Overflow and Spectrum from project and use GH Discussions
 2020-05-07 09:16:53 +02:00
Jim LAURIE
227a8cf8ed
Merge branch 'master' into chore/moveToGHDisc 2020-05-07 09:16:12 +02:00
Alexandre Bodin
63c56d96f2 Check pluralize name in ctb 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-07 00:56:33 +02:00
soupette
ccd03cb753 Upgrade buffetjs 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-05-06 22:44:39 +02:00
Alexandre Bodin
b109d6878e Merge branch 'master' into develop 2020-05-06 21:48:20 +02:00
cyril lopez
69448ef767
Merge pull request #6064 from strapi/front/ctm-loader 
CTM ListView loader
 2020-05-06 18:08:04 +02:00
Ky
fc5545e618 Merge branch 'develop' of github.com:strapi/strapi into front/ctm-loader 2020-05-06 17:03:08 +02:00
cyril lopez
8194a255d8
Merge pull request #5975 from strapi/front/media-lib-loader 
Media lib listView loadingBar and loadingIndicator
 2020-05-06 17:02:23 +02:00
DMehaffy
6fdd43a1ca
PR feedback 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-06 08:01:54 -07:00
cyril lopez
81100b02eb
Merge branch 'develop' into front/media-lib-loader 2020-05-06 16:51:26 +02:00
cyril lopez
7a66129866
Merge pull request #6073 from strapi/front/leftmenu-ui 
Space between icon and label
 2020-05-06 16:50:53 +02:00
Ky
1a78baa7b8 Merge branch 'front/media-lib-loader' of github.com:strapi/strapi into front/media-lib-loader 2020-05-06 16:49:37 +02:00
Ky
55c86b57b2 update getHeaderLabel unit tests 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-05-06 16:49:07 +02:00
virginieky
23a6ef73ec
Merge branch 'develop' into front/leftmenu-ui 2020-05-06 16:36:51 +02:00
virginieky
0c8a1f57ef
Merge branch 'develop' into front/media-lib-loader 2020-05-06 16:35:31 +02:00
Guilherme Pacheco
677b25007f
Fix user register test 
Signed-off-by: Guilherme Pacheco <guilherme.f.pacheco@gmail.com>
 2020-05-06 10:42:22 -03:00
Guilherme Pacheco
aa34dd256f
Update register mutation input 
Signed-off-by: Guilherme Pacheco <guilherme.f.pacheco@gmail.com>
 2020-05-06 10:42:17 -03:00
lpouvreau
9c90c7449e
Removed wrong extra double quote from plugins doc (#5981) 2020-05-05 19:40:24 +02:00
Alex Yackovlev
c9925f3fa8
Prevent fall through in the model search method when a plugin is specified (#6004) 
Signed-off-by: Aleksandr Yackovlev <a.yackovlev@corp.mail.ru>
 2020-05-05 19:38:41 +02:00
Thiago Augusto
a96d41eeca
Preventing parse-type Date test failure due to Time Zone differences (#6044) 
Signed-off-by: Thiago Augusto <thiago.android88@gmail.com>
 2020-05-05 19:34:32 +02:00
Robert Piosik
d5f3ab79c3
docs: remove duplication in menu; (#6039) 
Guides/Count with GraphQL

Signed-off-by: Robert Piosik <robertpiosik@gmail.com>
 2020-05-05 19:16:43 +02:00
Tomislav Biscan
f35de46519
Changes the App Engine HOST variable to '0.0.0.0' (#6040) 
Setting the `HOST` variable to one that has `*.appspot.com` domain seems to be causing connectivity issues for multiple people - https://github.com/strapi/strapi/issues/3433#issuecomment-621764964
The solution is simply setting `0.0.0.0`.
 2020-05-05 19:16:01 +02:00
Alexandre Bodin
4d5af2c95d Make password input optional while editing 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-05 19:05:43 +02:00
Ky
005d060730 Merge branch 'develop' of github.com:strapi/strapi into front/media-lib-loader 2020-05-05 16:23:51 +02:00
Ky
b5dfa46d31 apply PR review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-05-05 16:23:05 +02:00
virginieky
3a0f396ab3
Merge branch 'develop' into fix/ctb-default-date-input 2020-05-05 15:35:22 +02:00
HichamELBSI
e2bb3916a2 Fix default value for Date input in CTB 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-05-05 15:25:18 +02:00
virginieky
3acf88a6bb
Merge branch 'develop' into front/leftmenu-ui 2020-05-05 15:11:08 +02:00
Alexandre Bodin
72ad156f20 Merge branch 'master' into develop 2020-05-05 15:01:11 +02:00
Alexandre Bodin
a3304c7b88 Merge tag 'v3.0.0-beta.20.2' 
v3.0.0-beta.20.2

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-05 15:00:38 +02:00
Alexandre Bodin
a27d5f210d v3.0.0-beta.20.2 v3.0.0-beta.20.2 2020-05-05 14:56:13 +02:00
Alexandre BODIN
c7cc0b64ac
Merge pull request #6072 from strapi/security/6069-registration-confirmed-bypassed 
Only allow registeration with specific fields
 2020-05-05 14:54:27 +02:00
Alexandre Bodin
a927f7e19b Only allow registeration with specific fields 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
Co-authored-by: diogotcorreia
 2020-05-05 14:46:44 +02:00
Ky
def471ef5f apply PR review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-05-05 14:46:17 +02:00
Kwinten Li
02d808eec3 Update gcs file config in GAE deployment guide 
Update the Google Cloud Storage configuration guide according to the latest changes in version 3.0.0-beta.20 in the Google App Engine deployment guide

Signed-off-by: Kwinten <kwinten.yc.li@gmail.com>
Update gcs file config in GAE deployment guide
 2020-05-05 18:31:55 +08:00
Ky
e4af03cc2b fix space between icon and label 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-05-05 11:54:03 +02:00
Ky
740bbd02f7 add loading to CTM listview 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-05-05 02:05:35 +02:00
Ky
c02abe90fc rename const 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-05-05 01:07:26 +02:00
Ky
18ac81057b Merge branch 'develop' of github.com:strapi/strapi into front/media-lib-loader 2020-05-05 00:54:56 +02:00
Ky
03d86c53fc split media lib HomePage into compos 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-05-05 00:52:47 +02:00
Jozef Culen
08eeea7d0b
Updated code 
Using unedefined 'entry' variable is crashing the server
 2020-05-04 18:55:48 +02:00
Alexandre BODIN
6419a4e664
Merge pull request #5927 from strapi/chore/strapi-database-lifecycle 
Chore/strapi database lifecycle
 2020-05-04 17:34:58 +02:00
Alexandre Bodin
b928013e43 Cleanup code and doc 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-04 17:27:09 +02:00
Alexandre Bodin
9cb850e212 Merge branch 'master' into develop 2020-05-04 12:19:51 +02:00
Alexandre BODIN
225ffecd7c
Merge pull request #6009 from strapi/fix/4919/deletingContentTypeBreaksUploadRefsMongo 
Prune obsolete files relations on startup
 2020-05-04 12:17:26 +02:00
Convly
a615f16bb5 Move orm condition directly into the pruneObsoleteRelations query 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-05-04 11:27:52 +02:00