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

175 Commits

Author SHA1 Message Date
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
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
Alexandre BODIN
8cf4f94db6
Merge pull request #7217 from strapi/fix/pg-core-store 
Fix core_store init first
 2020-07-29 13:16:46 +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
Alexandre Bodin
8b6bf7fd10 Fix core_store init first 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-27 20:26:56 +02: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
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
35bae7df57 v3.1.1 2020-07-23 18:53:55 +02:00
Alexandre Bodin
1bbf1bc0dc v3.1.0 2020-07-21 19:30:45 +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
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
Alexandre Bodin
4d31935716 v3.0.6 2020-07-16 17:03:04 +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
Alexandre Bodin
85ea0abdc8 Add condition 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:16 +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
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
c8d743ef60 Cleanup and add tests 
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
047a0be908 move function from bootstrap to service 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:10:11 +02:00
Pierre Noël
3084b854d4 rename attributes -> values 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:09:53 +02:00
Pierre Noël
8598cee8d0 fourth refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:09:52 +02:00
Pierre Noël
6a1d65bc37 third refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:09:52 +02:00
Alexandre Bodin
7c8d51d15d fix 204 issues and use strapi.db.getModelByAssoc 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:59:38 +02:00
Alexandre Bodin
ba8509eac8 Apply PR feedbacks 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:59:38 +02:00
Alexandre Bodin
c6e08dcb57 Add assign permission 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:59:37 +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
Pierre Noël
308beddb24 add DELETE /admin/roles 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:58:07 +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
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
Convly
1182b848dd Fix weird behavior on strapi-admin e2e tests for mongo 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:38:18 +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
soupette
62a79a5fc0 Created basic routing for the settings 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 09:45:28 +02:00
Pierre Noël
10092f5a57 refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-01 11:59:33 +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
Alexandre Bodin
eaf40e1ada v3.0.5 2020-06-23 12:18:00 +02:00
Alexandre Bodin
9ed11a6682 v3.0.4 2020-06-19 09:19:52 +02:00
Alexandre Bodin
c909d7162d v3.0.3 2020-06-18 19:17:15 +02:00
Boom Lee
a26b4f65a8
Fix node version (#6482) (#6691) 2020-06-16 11:32:23 +02:00
Alexandre Bodin
497fb742eb v3.0.2 2020-06-15 17:09:15 +02:00
Abel Soares
af634b7f32
Remove options pool for non sqlite3 clients (#6469) 
Signed-off-by: abelsoares <abelbarbosasoares@gmail.com>
 2020-06-11 12:04:41 +02:00
Alexandre Bodin
5b64e05d7f v3.0.1 2020-05-29 09:38:21 +02:00
Alexandre Bodin
6bb7a7f198 v3.0.0 2020-05-26 15:09:32 +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
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 2020-05-07 13:02:11 +02:00