yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-12 10:48:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,892 Commits 114 Branches 488 Tags
Commit Graph

321 Commits

Author SHA1 Message Date
Alexandre BODIN
309be28183
Merge branch 'master' into patch-7 2019-12-09 10:06:52 +01:00
Mathijs Nelemans
fcdbc4fbe3 Wrap tsvector attributes with coalesce before join 
Fixed a bug where joining multiple tsvector attributes results in NULL
because one of the columns contains NULL. The expected behaviour is to
ignore that column instead, which is achieved by setting it to an empty
string
 2019-12-07 12:40:05 +01:00
Jørgensen
5fd9677406
Use the id of entry to update relations 
Fixes #4644
 2019-12-03 12:59:33 +01:00
Alexandre Bodin
cf6ecbff4f v3.0.0-beta.17.8 2019-12-01 23:20:50 +01:00
Jim LAURIE
8199f2d59c v3.0.0-beta.17.7 2019-11-29 17:36:51 +01:00
Alexandre Bodin
9aff9af165 v3.0.0-beta.17.6 2019-11-25 18:54:50 +01:00
Guilherme Bernardino
f378680a00 Do not create manyRelation tables if autoMigration is false. (#4458) 
ManyToMany and ManyWay relation tables are created even with the autoMigration option equal to false.
 2019-11-06 14:46:52 +01:00
Alexandre Bodin
b2e0ec5d1f v3.0.0-beta.17.5 2019-11-04 17:52:02 +01:00
Alexandre Bodin
8cfc6e43c6 Fix graphql nested groups returning null 2019-10-24 00:12:20 +02:00
Alexandre Bodin
7a61db7285 v3.0.0-beta.17.4 2019-10-23 15:11:30 +02:00
Alexandre Bodin
9280cf9cd7 Merge branch 'master' into develop 2019-10-22 11:15:09 +02:00
Alexandre Bodin
3ddd383c30 v3.0.0-beta.17.3 2019-10-22 11:05:52 +02:00
soupette
6a852ad6cb Fix conflicts 2019-10-18 15:51:44 +02:00
Alexandre Bodin
b6feabf689 v3.0.0-beta.17.2 2019-10-18 13:42:22 +02:00
Alexandre Bodin
02f98bc887 Fix groups creation/update not working when null group bofre in the loop 2019-10-18 11:20:51 +02:00
Alexandre Bodin
f0ad2ab52c Merge branch 'master' into develop 2019-10-16 14:16:52 +02:00
Alexandre Bodin
9f0713649b v3.0.0-beta.17.1 2019-10-16 11:42:54 +02:00
Alexandre Bodin
7c8eda443e v3.0.0-beta.17 2019-10-16 10:40:18 +02:00
soupette
beef6e5510 Fix conflicts 2019-10-10 06:34:31 +02:00
soupette
75abb17f0f Fix conflicts 2019-10-08 09:17:47 +02:00
Alexandre Bodin
2d04d25097 v3.0.0-beta.16.8 2019-10-04 11:57:46 +02:00
Alexandre BODIN
2dfee17271
Merge branch 'master' into master 2019-10-02 11:52:15 +02:00
soupette
b6c0e2e87b Merge branch 'develop' of github.com:strapi/strapi into stm/update 2019-10-02 11:39:46 +02:00
Alexandre Bodin
dbd621e6d8 v3.0.0-beta.16.7 2019-10-01 12:15:48 +02:00
Josh Rose
5012687b41
fix: Correctly quote column names 2019-09-30 17:33:07 +02:00
Alexandre Bodin
8809766d1a Do not set default timestamp value for date types 2019-09-27 20:08:34 +02:00
soupette
6f8b23d254 Fix conflicts 2019-09-27 16:26:09 +02:00
Alexandre Bodin
6305bee43b v3.0.0-beta.16.6 2019-09-26 14:35:06 +02:00
Alexandre Bodin
bf7870de3b Merge branch 'master' of github.com:strapi/strapi into chore/routing-x-forwarded 2019-09-18 17:29:09 +02:00
Alexandre Bodin
84adbf3bcf v3.0.0-beta.16.5 2019-09-18 14:00:21 +02:00
Alexandre BODIN
7a94d9dad9
Merge branch 'master' into chore/routing-x-forwarded 2019-09-18 13:27:39 +02:00
Alexandre Bodin
df236d0642 v3.0.0-beta.16.4 2019-09-17 12:14:39 +02:00
cyril lopez
8657453ea2
Merge branch 'master' into eslint-update 2019-09-17 10:11:11 +02:00
Alexandre BODIN
9cf90a9a67
Merge branch 'master' into fix/3874-bookshelf-unicode-fix 2019-09-16 23:10:56 +02:00
Alexandre BODIN
c66eb5d2cf
Merge branch 'master' into chore/routing-x-forwarded 2019-09-13 17:40:50 +02:00
Alexandre Bodin
36e4e73ad3 v3.0.0-beta.16.3 2019-09-13 15:08:44 +02:00
Alexandre Bodin
852be46911 Stringify json input for pg to support arrays 2019-09-13 10:41:21 +02:00
Abdón Rodríguez Davila
54c383fd44
Merge branch 'master' into eslint-update 2019-09-12 15:05:53 +02:00
Alexandre Bodin
e20d781383 Merge branch 'master' into chore/routing-x-forwarded 2019-09-12 09:59:11 +02:00
Alexandre Bodin
7207184648 v3.0.0-beta.16.2 2019-09-11 19:22:05 +02:00
Alexandre Bodin
2d65ebeade Fix multi image upload deleting old links 2019-09-11 16:07:30 +02:00
Alexandre Bodin
7d51b8625d v3.0.0-beta.16.1 2019-09-10 16:33:22 +02:00
Alexandre BODIN
7e9adb789f
Merge branch 'master' into eslint-update 2019-09-10 16:29:46 +02:00
Alexandre Bodin
c23c2583ab Make sure the relation update is done in a transaction with simple default create and update 2019-09-10 14:47:18 +02:00
sheva
2462958aff Updating bookshelf after merge v.3.0.0-beta.16 2019-09-09 22:16:01 +02:00
Abdón Rodríguez Davila
315399527a Fix missed lint error 2019-09-09 15:32:02 +02:00
Alexandre Bodin
2530606e47 Merge branch 'master' into chore/routing-x-forwarded 2019-09-09 14:29:07 +02:00
Alexandre Bodin
05597970fa v3.0.0-beta.16 2019-09-09 13:35:57 +02:00
Alexandre Bodin
a22f2cefef Remove x-forwarded-host. 
- set security defaults for development mode that are standard
- refactor error messages to work without ctx.request.admin
- remove mask middleware and add a sanitization layer to the core-api to
hide private fileds
 2019-09-06 14:33:24 +02:00
Alexandre Bodin
99dbd21e0b Fix self-referencing many-to-many sql 2019-08-19 11:44:53 +02:00