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
11,893 Commits 121 Branches 507 Tags
Commit Graph

11893 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim LAURIE
eb048eef93 docs: fix typo 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-04-13 15:01:21 +02:00
Jim LAURIE
8daf68f976 docs: fix upload models name 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-04-13 14:58:37 +02:00
Jim LAURIE
9b3e7b2d9c
Merge pull request #5674 from strapi/docs-concepts-review 
Review concepts documentation
 2020-04-09 11:47:34 +02:00
Jim LAURIE
342cef19f4
Merge branch 'documentation' into docs-concepts-review 2020-04-09 11:43:01 +02:00
Jim LAURIE
7216f21760 docs: apply pr feedback 2020-04-09 11:41:55 +02:00
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
Jim LAURIE
c0ec9a54ec
Merge pull request #5088 from gambhiro/deploy-to-app-engine 
Guide to deploy to google app engine
 2020-04-03 13:50:31 +02:00
Jim LAURIE
810d333ef0
Merge branch 'master' into deploy-to-app-engine 2020-04-03 13:50:06 +02:00
Alexandre BODIN
f54cdfdd21
Merge pull request #5698 from diogotcorreia/patch-1 
Update Node LTS version on BUG_REPORT.md to v12
 2020-04-03 08:43:15 +02:00
Diogo Correia
356fe6bf2b
Update Node LTS version on BUG_REPORT.md to v12 2020-04-03 00:16:36 +01:00
Alexandre Bodin
e3b34580b5 extract params from ctx before caling services 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-02 19:51:24 +02:00
Jim LAURIE
0a522b3795
Merge pull request #5635 from chinhdo/fix/5555-quickStartGuide 
Fix issue #5555 - outdated references to "content-type" in Quick Start Guide/Tutorial
 2020-04-01 16:33:40 +02:00
Jim LAURIE
343a1bab38
Merge branch 'master' into fix/5555-quickStartGuide 2020-04-01 16:33:29 +02:00
Jim LAURIE
6344fc622c
Merge pull request #5615 from strapi/docs/faq_update 
Add development flow to FAQ
 2020-04-01 16:21:59 +02:00
Jim LAURIE
97c2664ed9
Merge branch 'master' into docs/faq_update 2020-04-01 16:21:18 +02:00
António Santos
37a1338d81 Added 0.0.0.0 to Deployment Configuration Doc 
There was a problem in Heroku when using the default "localhost". We must change it to "0.0.0.0". We can help others by adding this to the documentation so they don't have to invest much time to find the solution like me.

Signed-off-by: António Santos <toi.santos@gmail.com>
 2020-04-01 14:52:55 +02:00
Jim LAURIE
390f72d512 docs: review concepts 2020-04-01 11:48:38 +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 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
Chinh Do
da793ff552
Merge branch 'master' into fix/5555-quickStartGuide 2020-03-31 22:52:53 -04: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
Chinh Do
a9ae7e24c2
Merge branch 'master' into fix/5555-quickStartGuide 2020-03-30 19:37:38 -04:00
Alexandre Bodin
f7a8d06f54 Add docker-compose.dev file to easily work with different databases in dev mode 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Remove old files not used anymore

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Added info about conflict with local db instances and how to change port configurations

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Fix typos

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 19:05:31 +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
Alexandre BODIN
4ebcd12f7c
Merge pull request #5627 from strapi/fix/#3409/relationTablesCantHaveLongNames 
improve joinTable customization + test collectionName duplicates
 2020-03-30 16:41:51 +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
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
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
687673cd19
Merge pull request #5629 from strapi/chore/strapi-metrics 
Make strapi analytics simpler
 2020-03-30 14:51:27 +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 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
David Ye
9ec7d9066e
Fix typo (#5596) 2020-03-30 09:51:14 +02:00