yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 08:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,973 Commits 127 Branches 497 Tags
Commit Graph

1404 Commits

Author SHA1 Message Date
Alexandre BODIN
77be3ea4c5
Merge pull request #7467 from strapi/users-permissions/create-new-role 
Users and Permissions in Settings menu
 2020-08-31 15:33:02 +02:00
Alexandre BODIN
d1e8b8df7c
Merge pull request #7450 from strapi/dependabot/npm_and_yarn/react-16.13.1 
Bump react from 16.13.0 to 16.13.1
 2020-08-31 15:24:08 +02:00
soupette
fb6010369a Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-26 10:38:54 +02:00
soupette
1b157c3d2f Fixes #7572 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-25 09:32:37 +02:00
HichamELBSI
4e4a77ff0f Add new role 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-08-17 17:40:44 +02:00
dependabot[bot]
888036ddbe
Bump react from 16.13.0 to 16.13.1 
Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) from 16.13.0 to 16.13.1.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.13.1/packages/react)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-13 17:22:49 +00:00
Pierre Noël
fb2db4b050 v3.1.4 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-13 19:05:20 +02:00
Pierre Noël
231263a353 v3.1.4 2020-08-13 18:58:14 +02:00
Alexandre BODIN
95e6837d45
Merge branch 'master' into chore/ml-delete-assets 2020-08-12 12:16:18 +02:00
Brendan Abbott
b3be6dea99
Improve empty state grammar for Assets (#6922) 
Signed-off-by: Brendan Abbott <brendan.abbott@shopify.com>
 2020-08-12 12:15:13 +02:00
Daniel Soares
6b34b5e8af
Added pt-BR localization to strapi-plugin-upload (#7375) 
Signed-off-by: Daniel Soares <daniel.soares@me.com>
 2020-08-12 12:08:09 +02:00
Laurent Comte
086677bee3
Fix/6641 (#7337) 
* Fix "Search for an asset" on Media Library loses focus
while typing

Signed-off-by: Laurent Comte <laurent.comte@gmail.com>

* Update the provider loggin doc + display absolute redirect uri in front

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

* update grant + doc twitter

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

* refacto

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

* replace .fr by .com

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

* move a tip

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

* Specify that only grant providers are supported

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

Co-authored-by: Pierre Noël <petersg83@gmail.com>
 2020-08-12 12:07:39 +02:00
Pierre Noël
bc96123485 use resolve 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-03 11:05:43 +02:00
Pierre Noël
c8207b7809 upload path can be absolute 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-31 17:39:29 +02:00
Alexandre Bodin
97922f99ae v3.1.3 2020-07-31 09:59:56 +02:00
Alexandre Bodin
6aaa018ff5 v3.1.2 2020-07-29 13:34:01 +02:00
egg
efdf03cf6d
add Japanese translation of media library (#7226) 
Signed-off-by: eggpogg <eggpogg.t@gmail.com>

Co-authored-by: cyril lopez <cyril.lpz@gmail.com>
 2020-07-29 13:21:50 +02:00
Alexandre Bodin
ac62bac98e Upgrade lodash 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-29 13:05:50 +02:00
dependabot[bot]
aea96bca68
Bump lodash from 4.17.15 to 4.17.19 (#7239) 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-29 11:10:32 +02:00
Bartosz
8c40d2192d
Fix invalid local uploads path (#6925) 
* Fix invalid local uploads path

File upload provider does not consider the strapi configuration. This patch should fix the problem.

* getStaticPath -> uploadDir

* Use config.get method

* plugin-upload tests fix
 2020-07-27 17:18:55 +02:00
Alexandre Bodin
35bae7df57 v3.1.1 2020-07-23 18:53:55 +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
soupette
cf762e9bf8 Fixes #7108 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-22 09:30:06 +02:00
soupette
fa46dd4f4c Merge branch 'master' of github.com:strapi/strapi into chore/ml-delete-assets 2020-07-22 08:54:33 +02:00
Alexandre Bodin
1bbf1bc0dc v3.1.0 2020-07-21 19:30:45 +02:00
soupette
3809d057be Improve delete asset workflow 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-21 10:18:13 +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
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
soupette
27a19dc9ed Fixes #6520 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-20 10:34:38 +02:00
Alexandre Bodin
6bafa35a36 Merge branch 'releases/3.1.0' into features/rbac 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-18 10:12:40 +02:00
alxnkt
26540ca95c Add description 
Signed-off-by: alxnkt <alxnkt@mail.ru>
 2020-07-18 10:07:37 +02:00
alxnkt
65293fd21c Auto rotate JPEG images 
Signed-off-by: alxnkt <alxnkt@mail.ru>
 2020-07-18 10:07:37 +02:00
Alexandre Bodin
4d31935716 v3.0.6 2020-07-16 17:03:04 +02:00
soupette
80c7d385d5 Reorder translation files by key value and add script to remove the unneeded keys 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-15 12:05:25 +02:00
Alexandre Bodin
109e41ea1f Fix e2e tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 13:53:56 +02:00
soupette
4e71345ee6 Fix check API call 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:48:45 +02:00
Alexandre Bodin
5c6851e6ba Update naming of permissions 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:45 +02:00
Convly
c9ebae4c9f Fix authorization issues due to null subject registration 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:45 +02:00
Convly
0cf76721e9 Add missing subject on upload permissions 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:45 +02:00
Convly
e63306b559 Rewrote users-permissions's controller to fit with rbac, fix various bugs in content-manager's controllers 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:44 +02:00
Convly
0e61698ef5 Fix upload w/ permissions bugs 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:43 +02:00
Convly
5f01d9ebe1 Add permissions on upload controller 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:42 +02:00
Convly
56d583e49e Add basis for upload controllers permissions 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:41 +02:00
Convly
b5fb5f8509 Add permissions to the content-manager routes 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:17 +02:00
Alexandre Bodin
4edad86029 Add basic created_by updated_by 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:16 +02:00
soupette
26713b66eb Fix delete in upload plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:48:15 +02:00
soupette
842f78d5fe Only display allowed filters 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:47:45 +02:00
soupette
df3346fb39 Fix permissions 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:47:23 +02:00
soupette
07d24de334 Fix input media 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:42:29 +02:00
soupette
af69b04238 Fix single types and input media 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:42:28 +02:00