yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-03 11:25:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,125 Commits 121 Branches 507 Tags
Commit Graph

14125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Liu
bc611017ca Merge branch 'master' into fix-Input-Number-issue 2020-07-27 10:19:07 +12:00
Eric Liu
e099889fe2 fix Input Number issue 
Signed-off-by: Eric Liu <eric@ericliu.page>
 2020-07-26 18:39:16 +12:00
dependabot[bot]
33634151d4
Bump pluralize from 7.0.0 to 8.0.0 (#7126) 
Bumps [pluralize](https://github.com/blakeembrey/pluralize) from 7.0.0 to 8.0.0.
- [Release notes](https://github.com/blakeembrey/pluralize/releases)
- [Commits](https://github.com/blakeembrey/pluralize/compare/v7.0.0...v8.0.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-07-25 08:53:05 +02:00
Eli
528dc4140e
Fix typos with the module.exports functions. (#7070) 
The `module.exports` example code is missing a closing parenthesis at the end of each example. Added the closing parenthesis.
 2020-07-25 08:46:16 +02:00
alaoui abdellah
bca8bb662a
style: 📝 Improve error message of file upload by adding an example (#7111) 
Signed-off-by: Abdellah Alaoui <als.abdellah@gmail.com>
 2020-07-25 08:45:06 +02:00
Alexandre BODIN
3d1cb2ca4d
Merge pull request #7130 from ByungJun25/documentation 
Update draft.md
 2020-07-25 08:43:19 +02:00
Alexandre Bodin
004791817e Cleanup shelljs 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-25 08:41:31 +02:00
Alexandre BODIN
ab77f264ae
Merge pull request #7159 from strapi/fix/sortAndQuery 
fix count with sort param
 2020-07-24 15:11:17 +02:00
Alexandre BODIN
1c6ccfedfb
Merge pull request #7150 from MattieBelt/docs/add-extension-warning 
Add extension warning
 2020-07-24 15:09:31 +02:00
Pierre Noël
6d825fc3ca fix count with sort param 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-24 15:06:38 +02:00
Alexandre BODIN
df7d7d416a
Merge pull request #7155 from strapi/fix/7139 
Fixes #7139
 2020-07-24 14:26:19 +02:00
soupette
a9387d49f4 Fixes #7139 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-24 12:11:52 +02:00
Igor Tatarintsev
bb6365213b
Bump VK provider version (#6594) 
Signed-off-by: Igor Tatarintsev <ietatarin@gmail.com>
 2020-07-24 11:10:09 +02:00
MattieBelt
7627dba96a Add extension warning 
Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>
 2020-07-24 09:40:35 +02:00
Alexandre Bodin
35bae7df57 v3.1.1 v3.1.1 2020-07-23 18:53:55 +02:00
Alexandre BODIN
9e53ee7220
Merge pull request #7146 from strapi/fix/missing-telemtry 
Fix missing event
 2020-07-23 18:51:21 +02:00
Alexandre Bodin
83b7926e3a Fix missing event 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-23 18:36:29 +02:00
Alexandre BODIN
ce769d7474
Add migration warning (#7143) 
* Add migration warning

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

* minor tweak to grammer

Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>

Co-authored-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-07-23 09:25:35 -07:00
Alexandre BODIN
f21524bbbe
Merge pull request #7054 from strapi/fix/usersAndPermsLocalAuth 
update doc + add localhost in confirmation links if url is not set
 2020-07-23 16:16:08 +02:00
Alexandre BODIN
a588c55f20
Merge pull request #7136 from strapi/fix/upload-api 
Fix upload api
 2020-07-23 14:56:35 +02:00
Alexandre Bodin
e18c54b225 Fix upload api 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-23 14:21:45 +02:00
Pierre Noël
75be8688d2 DOC replace .html by .md 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-23 11:09:42 +02:00
Pierre Noël
7465b74d25 fix typo + remove comment 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-23 11:09:41 +02:00
Pierre Noël
4dc853a6e1 update doc + add localhost in confirmation links if url is not set 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-23 11:09:21 +02:00
Byungjun Woo
6a2ec56b2d
Update draft.md 
fixed wrong path on 'Apply our changes'
 2020-07-23 11:00:25 +02:00
Alexandre Bodin
8fd98b0c33 Fix test 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-22 15:17:23 +02:00
DMehaffy
a58cd8f17b
Fixing service documentation and fixing DO referral link (#7101) 
* Fix service docs for upload plugin

https://github.com/strapi/strapi/discussions/7090

* Change DO referral links
 2020-07-22 14:23:54 +02:00
Will Eldrid-Otterburn
22319dc6d0
Upgrade apollo-server-koa (#7087) 
* Upgrade apollo-server-koa

Signed-off-by: Will Eldrid-Otterburn <will.eldrid-otterburn@red-badger.com>

* Set apollo-server-koa to strict version

Signed-off-by: Will Eldrid-Otterburn <will.eldrid-otterburn@red-badger.com>

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-07-22 14:07:08 +02:00
Abdón Rodríguez Davila
86d1690314
Setup official GitHub Dependabot (#7103) 
* Setup official GitHub Dependabot

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Add .npmrc file

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-07-22 11:43:45 +02:00
Maxwell Simmer
9684cd30db
Updates webhooks RegExp to allow undescores, fixes #5543 (#7079) 
Signed-off-by: Maxwell Simmer <maxwell.simmer@gmail.com>
 2020-07-22 10:49:55 +02:00
Alexandre Bodin
502f2485b2 update yarn.lock 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-22 10:27:14 +02:00
Alexandre Bodin
246d9e8197 Merge remote-tracking branch 'origin/master' 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-22 08:10:55 +02:00
Alexandre Bodin
0c4c955980 Add note in doc about the version for OR and AND operators 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-22 08:10:04 +02:00
Alexandre Bodin
ee0286ce5b Add note in doc about the version for OR and AND operators 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-22 08:09:45 +02:00
Alexandre Bodin
1bbf1bc0dc v3.1.0 v3.1.0 2020-07-21 19:30:45 +02:00
Alexandre BODIN
35aafde228
Merge pull request #7060 from strapi/fix/dot-env-load 
Make sure dot env is loaded at the right moment
 2020-07-20 19:33:57 +02:00
Alexandre BODIN
c2fb4904cd
Merge pull request #6965 from strapi/features/rbac 
Features/rbac
 2020-07-20 19:07:46 +02:00
Alexandre BODIN
e0ee7732ec
Merge pull request #7084 from strapi/chore/update-license-info 
Update license info
 2020-07-20 19:02:50 +02:00
Alexandre Bodin
62b2192c95 Update license info 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-20 18:40:52 +02:00
Pierre Noël
9983d3b44e clean conditions at get and update 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-20 17:40:01 +02:00
soupette
f47b781249 Change pricing page url 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-20 16:20:11 +02:00
Alexandre BODIN
6baa8dbb98
Merge pull request #7041 from strapi/chore/markdown-it 
Change preview for markdown-it in order to have all md support
 2020-07-20 13:19:48 +02:00
Alexandre BODIN
47de0851bc
Merge pull request #7046 from strapi/fix/ce-allow-role-name-edition 
Allow name edition in CE
 2020-07-20 12:46:48 +02:00
Alexandre Bodin
f4dfe8c1f2 Merge branch 'fix/ce-allow-role-name-edition' of github.com:strapi/strapi into fix/ce-allow-role-name-edition 2020-07-20 11:46:49 +02:00
soupette
9ba69f687c Disable super admin role edition 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-20 11:46:03 +02:00
Alexandre Bodin
9138034dbc Make admin role not editable at all 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-20 11:39:26 +02:00
Alexandre BODIN
3085994ec7
Merge pull request #7063 from abdonrd/slugify 
Update slugify dependency
 2020-07-20 11:30:51 +02:00
soupette
138f3bd0e9 Upgrade buffet.js 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-20 10:50:13 +02:00
soupette
27a19dc9ed Fixes #6520 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-20 10:34:38 +02:00
soupette
71d928414b Disable super admin role edition 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-20 10:10:13 +02:00