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

4665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim LAURIE
5838d19f81
Merge branch 'master' into chore/test-against-nodejs-8-10 2018-06-11 15:39:20 +02:00
Daniel Ruf
24750caea2
chore: only test Node.js 9 and 10 2018-06-09 21:27:31 +02:00
Jim LAURIE
92a3c453b7
Merge pull request #1338 from strapi/change-stm-link 
Move settings-manager to configuration section
 2018-06-08 21:01:22 +02:00
Jim LAURIE
fd69eff50c
Merge branch 'master' into change-stm-link 2018-06-08 20:20:41 +02:00
Jim LAURIE
88b95bbeed
Merge pull request #1295 from strapi/fix-1262 
Use suggested content type names when setting relations
 2018-06-08 19:05:58 +02:00
Jim LAURIE
7e60299e43
Merge branch 'master' into fix-1262 2018-06-08 17:33:28 +02:00
Jim LAURIE
7236623359
Merge pull request #1309 from nurikabe/patch-2 
Left-align form labels in Edge
 2018-06-08 17:33:15 +02:00
Jim LAURIE
6af48e7622
Merge branch 'master' into patch-2 2018-06-08 17:15:17 +02:00
Jim LAURIE
04045f1977
Merge pull request #1335 from johannpinson/patch-6 
Upgrade version to fix history bug on GraphQL Playground
 2018-06-08 17:14:56 +02:00
Daniel Ruf
a4e35f4146
chore: test against Node.js 8 and 10 2018-06-07 13:37:26 +02:00
Johann Pinson
e923971805
feat(playground): upgrade the minimal version 2018-06-07 12:51:10 +02:00
Jim LAURIE
cbca97feb3
Merge pull request #1329 from strapi/3.0.0-alpha.12.3 
3.0.0-alpha.12.3
 2018-06-07 11:59:33 +02:00
soupette
228e04c44e Move settings-manager to configs 2018-06-07 11:32:43 +02:00
Jim LAURIE
740471024c
Merge branch 'master' into patch-2 2018-06-06 21:02:20 +02:00
soupette
e9e7d48119 Fix PR feedback 2018-06-06 17:46:18 +02:00
soupette
40b267a6a6 Merge branch 'master' of github.com:strapi/strapi into fix-1262 2018-06-06 17:46:04 +02:00
Jim Laurie
2a449532ec 3.0.0-alpha.12.3 v3.0.0-alpha.12.3 2018-06-06 17:34:07 +02:00
Jim LAURIE
c2df2ae393
Merge pull request #1327 from strapi/fix-build-assets-link 
Fix build assets url
 2018-06-06 14:57:10 +02:00
Jim LAURIE
4d0083a4b6
Merge branch 'master' into fix-build-assets-link 2018-06-06 14:43:57 +02:00
Jim LAURIE
796484b6ad
Merge pull request #1326 from strapi/fix-remove-manyToMany 
Fix delete relations manyToMany mongoose
 2018-06-06 14:43:38 +02:00
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
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
5698969770 Fix build 2018-06-05 19:03:59 +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
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
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
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
soupette
78c9c8b936 Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-06-01 14:55:12 +02:00