yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 16:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,973 Commits 129 Branches 498 Tags
Commit Graph

287 Commits

Author SHA1 Message Date
Alexandre Bodin
cdc9bc2167 Allow multiple args in policies 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:43 +02:00
Alexandre Bodin
44a7e2321d Update findOne 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:42 +02:00
Alexandre Bodin
29fcf7c3cd Clean find relation list and tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:42 +02:00
Convly
36facdfd00 Add new sanitize-entity.js 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:41 +02:00
Convly
20f80b2361 Better permissions-manager.sanitize behavior 
Forbid empty arrays as fields for permissions (on ability creation)
Differentiate input from output sanitizing

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:38 +02:00
Convly
8b81395171 Fix filename typo 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:17 +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
Convly
11ba971302 Rework policy handling, add util to create policy factories, allow array declaration for hasPermissions 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:16 +02:00
Convly
b3f602d207 Rework policies resolving (allow policy generators) / Add hasPermissions policy 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:16 +02:00
Alexandre Bodin
966d9c554f Move hasDeepFilters to utils 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:36:26 +02:00
Alexandre Bodin
82316bbf3a Allow or operator and working with bookshelf 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:32:44 +02:00
Pierre Noël
1ee5b7f189 fifth refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:10:09 +02:00
Convly
765d7aaa52 Add check many permissions route/controller / Add userAbility to the context's state / Add isAuthenticatedAdmin.js 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:05:50 +02:00
Pierre Noël
42e3b64689 refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:05:08 +02:00
Pierre Noël
bbb1353927 remove hidden contentTypes from permission actions list + fix tests 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:05:07 +02:00
Pierre Noël
e078c0b022 rename permissions to actions, inverted params of provider.get, separated formatter, add possibility to not specigy pluginName for ::application 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:05:07 +02:00
Pierre Noël
ae0dcb9745 add route GET /admin/permissions 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:05:06 +02:00
Pierre Noël
5fffffa72d add permission registry provider 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:05:06 +02:00
Convly
248546581f Accept ids equal to 0 as StrapiID 2020-07-08 11:04:22 +02:00
Convly
65f0e7e3f3 Use custom type for strapiID & move it to strapi-utils 2020-07-08 11:04:21 +02:00
Alexandre Bodin
7346b983c5 Add domain model for permission 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:59:37 +02:00
Pierre Noël
7f0bb01a07 refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:59:36 +02:00
Pierre Noël
970a470034 add tests + make role decription optional + refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:59:34 +02:00
Pierre Noël
86882a4aaa refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:58:08 +02:00
Convly
651d42dbea fix PR comments, move pagination logic to the database layer, handle searches 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:50:44 +02:00
Convly
08d121cd2d Remove useless parseInt from findPageQueryFactory.js 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:49:28 +02:00
Convly
60b24dd3c3 Add GET /admin/users route and new pagination system 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:49:22 +02:00
Alexandre Bodin
919aae2211 Fix unit tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:21:28 +02:00
Convly
87a50a0231 Use directly getModel instead of fetching all the models 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:21:26 +02:00
Convly
8a69d187d0 Update models attributes & get models from the database manager 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:21:24 +02:00
Convly
1f3506710d Handle special scenarios where pluginName === 'admin' when retrieving models 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:21:16 +02:00
Pierre Noël
950a21469f add filtering to search route 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-06-30 15:50:52 +02:00
Pierre Noël
c12c6e95b4
make serverUrl absolute for watch-admin (#6405) 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-28 11:38:50 +02:00
Pierre Noël
4a6ef41201
openbrowser on localhost instead of 0.0.0.0 (#6391) 
Signed-off-by: Pierre Noël <petersg83@gmail.com>

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-05-28 11:17:59 +02:00
Alexandre BODIN
f1116160ad
Merge pull request #6012 from mkqavi/fix/local-upload-url-encoding 
Fix url encoding for local upload provider
 2020-05-19 13:40:18 +02:00
Pierre Noël
20aedc0e68 refactor 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-15 17:15:24 +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
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
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
Pierre Noël
e0e561e6d0 add test for escapeQuery() 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-04-30 19:47:04 +02:00
Pierre Noël
015480b1b5 Change search logic 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-04-30 19:47:02 +02:00
Alexandre Bodin
087920fb47 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-31 11:58:31 +02:00
Pierre Noël
f2663eb1f7 improve joinTable customization + test collectionName duplicates 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-27 15:51:23 +01:00
soupette
38b7823b34 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-26 08:01:22 +01:00
Alexandre Bodin
d19189b626 Treat mime ncontains as AND params in files list 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-23 17:30:19 +01:00
Pierre Noël
be6517c02d refacto strapi-generate-* + move nameToSlug to strapi-utils 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-23 10:42:34 +01:00
Alexandre Bodin
c8de166051 Add deleteRelations logic in connectors 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-20 11:04:23 +01:00
Alexandre Bodin
7a8c865051 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 15:18:08 +01:00
Alexandre Bodin
f6cf06d22c Add notNull validator for edition 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-18 09:02:48 +01:00
Alexandre Bodin
780f2695df Add some more rules 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-17 15:55:08 +01:00