yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 15:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,102 Commits 138 Branches 514 Tags
Commit Graph

13102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pierre Noël
20aedc0e68 refactor 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-15 17:15:24 +02:00
Pierre Noël
bc3cee4c54 sanatize email options 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-15 16:39:35 +02:00
Pierre Noël
8821f42694 update email settings getstarted 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-15 15:47:04 +02:00
Pierre Noël
d8f1449e73 change config format 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-15 15:05:35 +02:00
Pierre Noël
83f847f359 change config format 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-14 18:11:24 +02:00
Pierre Noël
0fe0f34895 update email settings configuration 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-14 16:56:14 +02:00
Pierre Noël
471d9ef89c move email settings from db to files 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-14 16:56:14 +02:00
Alexandre Bodin
ec0a573cef Merge branch 'master' into develop 2020-05-14 10:45:45 +02:00
Alexandre Bodin
4fb658efe8 Merge branch 'master' of github.com:strapi/strapi 2020-05-14 10:45:35 +02:00
Alexandre Bodin
2cd1b440ca Update yarn.lock 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-14 10:45:28 +02:00
Jim LAURIE
bcb3c3277f
Merge pull request #6032 from robertpiosik/docs/plugins-graphql 
Clean GraphQL plugin docs
 2020-05-14 10:32:56 +02:00
Jim LAURIE
7d958b0e97
Merge branch 'master' into docs/plugins-graphql 2020-05-14 10:32:48 +02:00
Jim LAURIE
ea834b963f
Merge pull request #6030 from LordSimal/patch-1 
Add strapi rebuild after WYSIWYG plugin has been created and add npm/yarn commands alternatives
 2020-05-14 10:31:06 +02:00
Jim LAURIE
4c7746d3e1
Merge branch 'master' into patch-1 2020-05-14 10:30:30 +02:00
Diogo Correia
9315d62e89
Update European Portuguese translations for strapi-admin (#6022) 
* Re-order and add missing translations to "pt" locale for strapi-admin

New translations haven't been translated to Portuguese yet.

Signed-off-by: Diogo Correia <me@diogotc.com>

* Update pt translations on strapi-admin

Signed-off-by: Diogo Correia <me@diogotc.com>

* Fix small typos in the new pt locale translations for strapi-admin

Signed-off-by: Diogo Correia <me@diogotc.com>

* Update pt_PT translations with suggestions from PR #6110

Signed-off-by: Diogo Correia <me@diogotc.com>

Co-authored-by: cyril lopez <cyril.lpz@gmail.com>
 2020-05-14 10:23:25 +02:00
Jim LAURIE
99544a7a16
Merge pull request #5893 from strapi/docs/fixLinks 
Clean up parameter and migration guide documentation and links
 2020-05-14 10:16:11 +02:00
Jim LAURIE
0bd9832ad0
Merge branch 'master' into docs/fixLinks 2020-05-14 10:16:00 +02:00
Alexandre Bodin
86edfa496d Merge branch 'master' into develop 2020-05-14 09:40:59 +02:00
Alexandre BODIN
7a5fbf6905
Merge pull request #6199 from trick0/user-count 
* added user count

Signed-off-by: Walter Cossu <walter.cossu@realt.it>

* added countSearch method to user service

* added countSearch method to user service

Signed-off-by: Walter Cossu <walter.cossu@realt.it>

* added user count

Signed-off-by: Walter Cossu <walter.cossu@realt.it>

* added user count

Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-05-14 09:40:19 +02:00
Alexandre BODIN
71798cf6d9
Merge pull request #6195 from strapi/chore/remove-email-config 
Remove email plugin admin files
 2020-05-14 09:38:40 +02:00
soupette
4395f72df5 Add email plugin description 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-05-14 01:54:36 +02:00
Walter Cossu
f5e9edb124 added user count 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-05-13 20:33:17 +02:00
Walter Cossu
26b66c6d50 Merge branch 'user-count' of https://github.com/trick0/strapi into user-count 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-05-13 20:27:12 +02:00
Walter Cossu
573d496293 added countSearch method to user service 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-05-13 20:25:46 +02:00
Walter Cossu
d139ca9591 added user count 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-05-13 20:23:54 +02:00
Walter Cossu
43a73b6f7c added countSearch method to user service 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-05-13 19:37:07 +02:00
Walter Cossu
bbb2bc235b Merge branch 'master' of https://github.com/trick0/strapi 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-05-13 19:13:23 +02:00
Walter Cossu
92299872da Merge branch 'master' of https://github.com/trick0/strapi 2020-05-13 19:10:45 +02:00
Walter Cossu
ff455cb616 added countSearch method to user service 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-05-13 19:10:05 +02:00
trick0
04337262cb Merge branch 'master' into master 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-05-13 18:33:44 +02:00
trick0
a824f807fc Merge branch 'master' into master 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-05-13 18:25:41 +02:00
soupette
ea84a5e669 Merge branch 'develop' of github.com:strapi/strapi into chore/remove-email-config 2020-05-13 17:22:14 +02:00
soupette
5400f3e1dd Remove email plugin admin files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-05-13 17:21:17 +02:00
Alexandre Bodin
773d6ef44f Merge branch 'master' into develop 2020-05-13 17:13:06 +02:00
Alexandre BODIN
2f84e42c44
Merge pull request #6112 from strapi/chore/configuration-dump-cli 
Configuration dump and restore cli
 2020-05-13 16:51:26 +02:00
Alexandre Bodin
2e31e79b60 Udpate doc 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-13 16:50:15 +02:00
Kevin Pfeifer
7d005ca12a
Merge branch 'master' into patch-1 2020-05-13 16:03:06 +02:00
Alexandre Bodin
79e9f6b1ac Add CLI documentation 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-13 11:52:36 +02:00
Alexandre Bodin
35f4b1748e Add import stats 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-12 18:02:11 +02:00
David Thomas
ba6c0b4ba2
Add Twitch auth provider (#6171) 
* Add Twitch auth provider

Signed-off-by: David Thomas <dev@synth3.tk>

* Remove unneeded label exclusion

Signed-off-by: David Thomas <dev@synth3.tk>
 2020-05-12 16:48:18 +02:00
Sulakin Vadim
30ba717525
fix vk providers (#5783) 2020-05-12 14:04:52 +02:00
Alexandre Bodin
d1d13fab23 Cleanup code 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-12 12:47:23 +02:00
Eddie Palmans
5235d94dc6
Fixed link to deployment guide (#6174) 2020-05-12 12:27:34 +02:00
Filipe Medeiros
3b9661acb2
Upgrade dependency version (#6149) 
* Ok, now I translated from start to finish

 Should be good to go, some stuff is still in English because it's impossible/worse to translate to PT

Signed-off-by: Filipe <filipesilvamedeiros@gmail.com>

* Updated the dependency. It's a patch, so it shouldn't break anything at all

Signed-off-by: Filipe <filipesilvamedeiros@gmail.com>

* Revert "Ok, now I translated from start to finish"

This reverts commit 7ea0574db78abb6fc0d328465e618b860fff89bb.

Signed-off-by: Filipe <filipesilvamedeiros@gmail.com>
 2020-05-12 12:03:15 +02:00
Pierre Noël
3787573828
updated server.url doc + remove server.admin.build doc (#6173) 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-12 11:28:32 +02:00
Alireza Kavian
603ffc1830
google provider section modified (#5730) 
The second "Client Id" should be: "Client Secret"
 2020-05-12 11:20:35 +02:00
David Ye
ee312eeb0a
Fix typo (#5665) 2020-05-12 11:08:15 +02:00
Alexandre Bodin
768b699eb6 Add aliases 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-12 10:55:10 +02:00
Kevin Pfeifer
b0d50ad21f
Merge branch 'master' into patch-1 2020-05-08 22:28:56 +02:00
Alexandre Bodin
900f0062cc Merge branch 'develop' 2020-05-08 13:53:36 +02:00