yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-08 08:46:42 +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
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
Marvin König
fa31b5dfc2
Fix file names containing reserved and unsafe URL characters 
This fixes the `generateFileName` function in the Strapi upload plugin,
so that reserved and unsafe charactes for URLs are replaced with
underscores.

Signed-off-by: Marvin König <dev@mkqavi.com>
 2020-05-13 13:17:26 +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
cyril lopez
567509eab7
Merge branch 'develop' into fix/ctb-default-date-input 2020-05-12 14:18:19 +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
cyril lopez
18409f043e
Merge branch 'develop' into fix/ctb-default-date-input 2020-05-12 09:19:20 +02:00
Louis Guitton
735e96c68b Fix broken link 
Signed-off-by: Louis Guitton <louisguitton93@gmail.com>
 2020-05-09 16:47:31 +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
Ålevosía
cd8ccb3c7a
Fix typographical errors in Models concept of documentation (#6094) 
Changed from 'liked' to 'linked'
 2020-05-08 13:52:47 +02:00
John Angelo
a09754a73c
changed docker volume for postgres (#6086) 
Signed-off-by: John Angelo <gelomorn@gmail.com>
 2020-05-08 13:51:37 +02:00
Pierre Noël
57d7d876b7
Fix/#4513/ability to use a sub path behind a proxy (#5833) 
* add possibility to use strapi on a non-root base url path

* fix documentation password form

* use server.url and admin.url in config

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* update doc proxy

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* move server.url location in config

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* refacto

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* add possibility to put relative urls

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* allow '/' as an admin url + refacto

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* update yarn.lock

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* refacto

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* Remove default proxy option

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

* fix github provider

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* fix github login

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* Remove files that should be here

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Co-authored-by: Pierre Noël <pierre.noel@strapi.io>
Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-08 13:50:00 +02:00
Kevin Pfeifer
7de1f2d51f
Merge branch 'master' into patch-1 2020-05-07 22:28:51 +02:00
ScottAgirs
d41227b75d Merge branch 'master' into patch---adjust-naming-to-password-mutations 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-05-07 13:05:29 -04:00
Alexandre Bodin
937e3baca8 Make strapi.load chainable 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-07 18:49:44 +02:00
Alexandre Bodin
7da81fef9e Add configuration:dump & configuration:restore commands 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-07 16:54:56 +02:00
Alexandre Bodin
34026fd88c Init 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-07 16:54:56 +02:00
Alexandre BODIN
2b3d94d747
Merge pull request #6047 from gfpacheco/bug/ignore-private-fields-on-register 
Ignore private fields input on user register
v3.0.0-rc.0 		2020-05-07 15:21:33 +02:00
Alexandre Bodin
c90e3eb67b Merge branch 'develop' of github.com:strapi/strapi into develop 2020-05-07 13:14:35 +02:00
Alexandre Bodin
f192d5e171 Merge branch 'master' into develop 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-07 13:14:23 +02:00
Alexandre Bodin
55c006a6b1 v3.0.0-beta.20.3 v3.0.0-beta.20.3 2020-05-07 13:02:11 +02:00
Alexandre BODIN
75bce78f95
Merge pull request #6097 from strapi/chore/ctb-verify-pluralized-ct-name 
Check pluralize name in ctb
 2020-05-07 13:00:08 +02:00
Alexandre BODIN
941537421d
Merge pull request #5969 from domenicoven/IT_translation 
Improving IT translation by adding missing labels
 2020-05-07 12:57:04 +02:00
cyril lopez
24e768c1e9
Merge pull request #6095 from strapi/chore/upgrade-buffet-3.1.1 
Upgrade buffetjs
 2020-05-07 11:19:27 +02:00
cyril lopez
c48be1bfd0
Merge branch 'master' into IT_translation 2020-05-07 11:02:12 +02:00