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

8212 Commits

Author SHA1 Message Date
Yassir Barchi
3a42a49162
Add RegExp as text type attribute validation option (#5648) 
* feat: add Regexp for attribute value validation

strapi-plugin-content-type-builder

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>

* feat: add Regexp for attribute value validation

strapi-plugin-content-manager

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>

* fix error on submit

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>

* add regex pattern validation

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>

* add api validation

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>

* fix lint issues

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>

* remove redundant code

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>

* fix en.json build issue

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>

* add the reset input logic to the regex field

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>
 2020-04-07 10:41:46 +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
f306feedd2 in dev mode use localhost has default hostname 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-01 11:14:39 +02:00
Alexandre Bodin
59332ae672 Fix host using lcoalhost not working on a lot of envs 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-01 11:14:39 +02:00
Long Nguyen
77e243f841 Refactor code convert GraphQL params to ORM conditions 
Signed-off-by: Long Nguyen <olragon@gmail.com>
 2020-03-31 16:01:39 +02:00
Long Nguyen
634592fb5b fix: GraphQL Aggregation Bookshelf where condition aren't applied to groupBy 
Signed-off-by: Long Nguyen <olragon@gmail.com>
 2020-03-31 16:01:39 +02:00
Convly
67187c38f2 Rename _type to type and type to nonRequiredType 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-03-30 16:45:00 +02:00
Convly
1103d96500 Rename noRequired to nonRequired 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-03-30 16:45:00 +02:00
Convly
98b5b4a029 GraphQL Aggregation: Remove required marker when checking for number types (int/float) 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-03-30 16:45:00 +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
Pierre Noël
9d7e78d528 remove useless use of stopWithError 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-30 15:02:01 +02:00
Alexandre BODIN
7b50291353
Merge pull request #5444 from strapi/fix/#4881/cantDisableOrOverrideRootPage 
Add possibility to delete index.html + remove use of production.html
 2020-03-30 15:02:01 +02:00
Alexandre Bodin
d60578c875 Update is truthy fn 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 14:51:03 +02:00
Alexandre Bodin
24000818f4 Add tests on middleware 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 14:51:03 +02:00
Alexandre Bodin
0888c3788b Add tests and avoid blocking in middleware 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 14:51:03 +02:00
Alexandre Bodin
5129a21d0b Cleanup unnecessary files 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 14:51:02 +02:00
Alexandre Bodin
a3d22e3f59 Move to strapi package directly 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 14:51:02 +02:00
Alexandre Bodin
86312ecbaf Add content-type kind property 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 14:50:45 +02:00
Alexandre Bodin
a8f909f4e3 Add dependencies 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 14:50:45 +02:00
Alexandre Bodin
6f2103a402 Init sender and middleware, ping 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 14:50:19 +02:00
Alexandre Bodin
6e3de95656 Init telemetry pkg 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 14:50:19 +02:00
Pierre Noël
ab79327577 move function checkDuplicatedTableNames in its own file 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-30 14:39:31 +02:00
Pierre Noël
053714c7be refacto 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-30 12:50:48 +02:00
Alexandre Bodin
24bd311678 v3.0.0-beta.19.4 2020-03-30 09:57:05 +02:00
Casey Collins
4a3ebe619a
Changed add new entity button to just use getName for consistency (#5632) (#5633) 
Signed-off-by: Casey Collins <4412526+cacodev@users.noreply.github.com>
 2020-03-30 09:54:05 +02:00
Daniel Karski
3a24755873
Set searching by properties (#5623) 
Signed-off-by: Daniel Karski <daniel.karski@polidea.com>
 2020-03-30 09:52:38 +02:00
cyril lopez
0730d91094
Fixes #5570 (#5620) 
Signed-off-by: soupette <cyril.lpz@gmail.com>

Co-authored-by: virginieky <3142866+virginieky@users.noreply.github.com>
 2020-03-30 09:51:47 +02:00
soupette
fb7e8f3db8 Fix fr trad for float and decimal 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-27 19:08:24 +01: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
Convly
f171029243 Change checkBadRequest's exception shape 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-03-27 14:33:55 +01:00
Convly
2d8e55838e Update path to contextBody attributes in schema.graphql.js@checkBadRequest() 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-03-27 12:19:44 +01:00
Jean-Sébastien Herbaux
4a8de29100
Fix ability to update unique constraints in mongoose (#5612) 
* Sync indexes on model mount with mongoose

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Use Mongoose.Model.syncIndexes callback arg to subscribe to Model's indexes messages. Get rid off errors-pron-promises.

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-03-27 11:39:53 +01:00
Lennart Stolz
9137233bea
Translations: Updated the 'terms' translations for 'de' (#5589) 
"Terms and Conditions" are called "Allgemeine Geschäftsbedingungen" in
German (often abbreviated as "AGB") or "Nutzungsbedingungen".

In the context of the admin sign-up of 'strapi' I'd go for the latter.
(Research results attached to the pull request)

The previous version "Begriffe" is wrong in this context as it is the
literal translation of the word "term".

Signed-off-by: Lennart Stolz <lennartstolz@me.com>
 2020-03-27 11:15:35 +01:00
Long Nguyen
77a5160d1a
Implement Graphql Aggregation Feature for Bookshelf (#5605) 
* Implement Graphql Aggregation Feature for Bookshelf

Signed-off-by: Long Nguyen <olragon@gmail.com>

* Fix no-unused-vars

Signed-off-by: Long Nguyen <olragon@gmail.com>

* Fix code to use `model.get()` instead of internal structure

Signed-off-by: Long Nguyen <olragon@gmail.com>
 2020-03-27 10:40:29 +01:00
Mariusz Wachowski
b96ed622ee
fix: short relation fields list have unnecessary scrollbar (#5438) 
Signed-off-by: Mariusz Wachowski <wachowski.mariusz@gmail.com>
 2020-03-27 09:51:57 +01:00
Alexandre BODIN
9fdb650c6c
Fix rerouting of destroy route in user-perm (#5581) 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-26 13:55:52 +01:00
Paul Jordaan
5423c14728
Remove condition that reset query start param (#5557) 
Every time the menu got closed the start condition for the query would get reset to  0. Expected behavior would be to load the next set of results.

Signed-off-by: Paul <paul@flow.rent>
 2020-03-26 12:14:45 +01:00
Pierre Noël
af1636b301 fix bad singular form of column name 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-26 11:21:17 +01:00
Pierre Noël
a63c692fca
don't generate default routes when generating plugin api (#5586) 
* don't generate default routes when generating plugin api

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* remove console log

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

Co-authored-by: Pierre Noël <pierre.noel@strapi.io>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-03-25 09:31:21 +01:00
Alexandre BODIN
b15db81adb
Merge branch 'master' into feature/missing-auth-mutations 2020-03-24 18:22:17 +01:00
Josh Johnston
b7fd5f28fd Fix the order of settings in ses provider 
Why:

- because there is a default hardcoded value in options.from, the
custom value would never be used.

Signed-off-by: Josh Johnston <josh@x-team.com>
 2020-03-24 19:43:13 +11:00
Alexandre BODIN
ea77e6c8f9
Merge branch 'master' into fix/#3889/wrongPathGenerateModelInPlugin 2020-03-23 18:05:28 +01:00
Roel Beerens
2570e27238 feat: Added missing forgotPassword, changePassword and emailConfirmation mutations/resolvers. Made a slight adjustment to the emailConfirmation controller function in Auth.js to return a UsersPermissionsLoginPayload when using GraphQL 
Signed-off-by: Roel Beerens <roel@gravity.nl>
 2020-03-23 18:02:26 +01:00
Diogo Correia
400893fd6a Prevent error when content type doesn't have searchable fields 
Signed-off-by: Diogo Correia <me@diogotc.com>
 2020-03-23 14:36:58 +00:00
Diogo Correia
684c65ab2e Add 'UID' field search to Mongoose 
Signed-off-by: Diogo Correia <me@diogotc.com>
 2020-03-23 14:36:58 +00:00
Alexandre BODIN
826bb8a9f4
Merge pull request #5576 from strapi/fix/removeConsole4xx 
Remove extra logs in users-permissions
 2020-03-23 14:29:52 +01:00
Pierre Noël
39648047a7 Merge branch 'master' into fix/#4487/filteringDataManyWayError500 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-23 12:01:20 +01:00
Pierre Noël
0c7029c2b1 lint 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-23 12:00:13 +01:00
Derrick Mehaffy
8f7af83049
Remove extra console.log in users-permissions 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-23 03:50:35 -07:00