yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-31 12:23:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,273 Commits 113 Branches 491 Tags
Commit Graph

9273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim LAURIE
3a4001da22
Merge branch 'master' into fix-remove-manyToMany 2018-06-06 14:29:32 +02:00
Jim Laurie
cc9abff66d Fix build assets 2018-06-06 14:18:23 +02:00
soupette
92600ab7b0 Handle bulk action for bookshelf 2018-06-06 12:47:29 +02:00
Jim Laurie
72f75ce8ec Fix delete relations manyToMany mongoose 2018-06-06 12:06:05 +02:00
Jim LAURIE
d8c9b54e5a
Merge pull request #1321 from strapi/fix-ctm-build 
Fix content-manager build
 2018-06-05 19:29:33 +02:00
soupette
a7411bbd9d Fix conflicts in Strapi.js 2018-06-05 19:12:25 +02:00
soupette
5698969770 Fix build 2018-06-05 19:03:59 +02:00
soupette
8832a5baab Delete many and update relations 
Co-authored-by aurelsicoko@gmail.com
 2018-06-05 18:35:19 +02:00
soupette
e145c82b7a Front 2018-06-05 17:56:53 +02:00
soupette
4e2b7218f6 Bulk actions front-end done 2018-06-05 14:20:13 +02:00
Jim LAURIE
9cde216457
Merge pull request #1304 from strapi/content-manager-filters 
Add filters in the content-manager
 2018-06-05 12:23:05 +02:00
soupette
8302d32d71 Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-06-05 12:06:17 +02:00
soupette
9a62aa4939 Fix PR feedback 2018-06-05 12:04:08 +02:00
Jim LAURIE
e7af7bbeef
Merge pull request #1314 from strapi/fix-decimal 
Fix decimal on pg and mysql
 2018-06-05 11:10:06 +02:00
Jim LAURIE
adf643854e
Merge branch 'master' into fix-decimal 2018-06-05 10:51:56 +02:00
Jim LAURIE
df86c67776
Merge pull request #1315 from strapi/fix-1186 
Fixes 1-N relations with the same content type
 2018-06-05 09:48:28 +02:00
soupette
47b1b7e456 Handle select unique 2018-06-04 20:51:57 +02:00
soupette
84d5d047eb Handle selectAll action 2018-06-04 20:26:17 +02:00
soupette
1af3ff7eff Fixes #1186 2018-06-04 19:24:08 +02:00
Jim Laurie
c82ba4c089 Fix decimal on pg an mysql fix #1273 2018-06-04 18:22:21 +02:00
Cyril lopez
cb895ab586 Fix PR feedback 2018-06-04 17:46:08 +02:00
Jim LAURIE
6de61bd2d6
Merge pull request #1311 from strapi/test-suits 
Test suits first round
 2018-06-04 15:11:59 +02:00
Jim LAURIE
047a887f49
Merge branch 'master' into test-suits 2018-06-04 14:52:41 +02:00
Jim Laurie
78e064e72c Fix missing file 2018-06-04 14:49:21 +02:00
Jim Laurie
c9b4e29c65 Merge branch 'test-suits' of github.com:strapi/strapi into test-suits 2018-06-04 14:43:09 +02:00
Jim Laurie
ec5ef9a240 Fix PR feedback 2018-06-04 14:39:26 +02:00
Jim LAURIE
7c915f2170
Merge pull request #1298 from strapi/fix-cors-option 
Fix cors on option request
 2018-06-04 14:28:31 +02:00
Jim LAURIE
cff5c248a9
Merge branch 'master' into fix-cors-option 2018-06-04 12:06:24 +02:00
Johann Pinson
8884a81994 feat(plugin): add enum icon inside table row 2018-06-04 12:05:17 +02:00
Johann Pinson
e594f311f7 feat(plugin): add enumeration to content type builder 2018-06-04 11:57:14 +02:00
Jim LAURIE
3d3d75b135
Merge branch 'master' into test-suits 2018-06-03 20:59:57 +02:00
Jim Laurie
8085a2deaf Update oneToOne test with id 2018-06-03 20:46:43 +02:00
Jim LAURIE
6bf7542dc0
Merge pull request #1310 from nurikabe/patch-3 
Specify MongoDB >= 2.6
 2018-06-03 14:53:35 +02:00
Evan Owens
238b3f9b4a
Specify MongoDB >= 2.6 
Need to use MongoDB >= 2.6 otherwise get wire version errors on start:
```
UnhandledPromiseRejectionWarning: MongoError: Server at 127.0.0.1:27017 reports wire version 0, but this version of Node.js Driver requires at least 2 (MongoDB2.6).
```
 2018-06-01 23:57:06 -04:00
Evan Owens
321d9ae47c
Left-align form labels in Edge 2018-06-01 21:21:11 -04:00
soupette
07583f27dc Design TableDelete 2018-06-01 17:43:14 +02:00
soupette
3f548f8cc5 Init bulk actions 
Design custom input checkbox
 2018-06-01 16:58:53 +02:00
Jim LAURIE
32158a20f1
Merge pull request #1302 from strapi/fix-add-ct 
Fix add multi column for mysql
 2018-06-01 16:07:38 +02:00
Jim LAURIE
d515177c4a
Merge branch 'master' into fix-add-ct 2018-06-01 15:49:57 +02:00
Jim Laurie
f284c5d3e0 Fix PR feedback 2018-06-01 15:49:08 +02:00
Johann Pinson
eda412785f feat(graphql): generate default name for Enum if not specified 2018-06-01 15:28:18 +02:00
soupette
78c9c8b936 Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-06-01 14:55:12 +02:00
soupette
71b017468d Fix PR feedback 2018-06-01 14:51:12 +02:00
Jim Laurie
676334d03d Launch test with mongo postgres and mysql 2018-06-01 14:31:30 +02:00
Jim LAURIE
eef8478533
Merge pull request #1279 from kamalbennani/bugfix/graphql-returns-empty-array-when-entities-are-not-hosted-by-the-model 
GraphQL returns empty array when entities are not hosted by the model
 2018-06-01 11:51:25 +02:00
Jim LAURIE
16c958f32f
Merge branch 'master' into bugfix/graphql-returns-empty-array-when-entities-are-not-hosted-by-the-model 2018-06-01 11:37:58 +02:00
Jim LAURIE
65d586b3d4
Merge pull request #1299 from strapi/fix-boolean-mysql 
Convert 1/0 to true/false for mysql
 2018-06-01 11:37:44 +02:00
Jim LAURIE
5199273be2
Merge branch 'master' into fix-boolean-mysql 2018-06-01 11:20:35 +02:00
Jim LAURIE
d55749cde2
Merge pull request #1307 from okaris/count-route-controller-service-bookshelf 
Added count to api template for bookshelf
 2018-06-01 10:58:08 +02:00
Okaris
d5cca40270 Added count to api template for bookshelf 2018-06-01 08:16:54 +03:00