yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-13 03:07:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,421 Commits 116 Branches 488 Tags
Commit Graph

489 Commits

Author SHA1 Message Date
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
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
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
Alexandre Bodin
5b64e05d7f v3.0.1 2020-05-29 09:38:21 +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
6bb7a7f198 v3.0.0 2020-05-26 15:09:32 +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
Alexandre Bodin
55c006a6b1 v3.0.0-beta.20.3 2020-05-07 13:02:11 +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
Alexandre Bodin
a3304c7b88 Merge tag 'v3.0.0-beta.20.2' 
v3.0.0-beta.20.2

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-05 15:00:38 +02:00
Alexandre Bodin
a27d5f210d v3.0.0-beta.20.2 2020-05-05 14:56:13 +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
6a6d53b402 v3.0.0-beta.20.1 2020-04-28 10:00:23 +02:00
Alexandre Bodin
9d8944ebfe v3.0.0-beta.20 2020-04-16 15:10:53 +02:00
Alexandre Bodin
cc9d23c3ac Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-07 20:24:39 +02:00
Alexandre Bodin
ff15757685 Merge tag 'v3.0.0-beta.19.5' 
v3.0.0-beta.19.5
 2020-04-01 11:31:04 +02:00
Alexandre Bodin
8d56e0c12f v3.0.0-beta.19.5 2020-04-01 11:27:56 +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
1535735eb6 Merge branch 'master' into fix/#3409/relationTablesCantHaveLongNames 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-30 15:42:08 +02:00
Alexandre Bodin
50df7365d6 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 12:04:04 +02:00
Alexandre Bodin
24bd311678 v3.0.0-beta.19.4 2020-03-30 09:57:05 +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
ecc24c5a4d Merge branch 'develop' into features/media-lib 2020-03-09 08:34:25 +01:00
Derrick Mehaffy
615bb166c3
Update lodash to fix security issues 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-06 06:42:35 -07:00
soupette
bdc2758613 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-06 11:44:20 +01:00
soupette
8a8929e97c v3.0.0-beta.19.3 2020-03-06 10:02:36 +01:00
MattieBelt
01579c21a1 Update strapi-utils yup v0.28.1 
Signed-off-by: Mattias van den Belt <mattias@taskhero.nl>
 2020-03-06 08:52:16 +01:00
Alexandre Bodin
e1a7074a4e Merge branch 'develop' into features/media-lib 2020-03-05 14:39:29 +01:00
Alexandre Bodin
b3e18e1de6 v3.0.0-beta.19.2 2020-03-05 14:32:42 +01:00
soupette
f1de079d77 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 10:22:49 +01:00
Alexandre Bodin
8e91e5abaf v3.0.0-beta.19.1 2020-03-04 18:42:31 +01:00
soupette
d6bc4e1941 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 14:52:29 +01:00
Alexandre Bodin
e222792181 v3.0.0-beta.19 2020-03-04 14:24:23 +01:00