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

8222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
f0829f6f7c Merge branch 'master' into feature/groups 2019-07-10 15:18:14 +02:00
Alexandre Bodin
3a94c7ea90 v3.0.0-beta.11 v3.0.0-beta.11 2019-07-10 15:09:03 +02:00
Alexandre BODIN
66028c78ad
Merge pull request #3594 from strapi/chore/allow-node-12 
Allow node 12 now that it is supported
 2019-07-10 15:04:59 +02:00
Alexandre Bodin
cbf0d21c08 Update requirements 2019-07-10 14:28:52 +02:00
Alexandre Bodin
aaf7e826c3 Merge branch 'master' into feature/groups 2019-07-10 11:01:44 +02:00
Alexandre Bodin
23fdc37b0f Allow node >= 10 2019-07-10 10:35:56 +02:00
Alexandre Bodin
3759582ccc Test node v12 engine 2019-07-10 10:21:12 +02:00
Alexandre BODIN
c5d3903798
Merge pull request #3544 from berdjabrahamian/master 
Admin sidebar scrolling support for firefox
 2019-07-10 09:44:02 +02:00
Alexandre BODIN
4793c94c40
Merge branch 'master' into master 2019-07-10 09:34:29 +02:00
Alexandre BODIN
6a3d2c8875
Merge pull request #3587 from abdonrd/update-lint 
Update ESLint dependencies for new projects
 2019-07-10 09:34:19 +02:00
Alexandre BODIN
773ca98df9
Merge branch 'master' into update-lint 2019-07-10 09:31:50 +02:00
Alexandre Bodin
8ece6eaa22 Merge branch 'master' into feature/groups 2019-07-09 16:11:01 +02:00
Abdón Rodríguez Davila
1b00044114 Lint all files 2019-07-09 15:54:51 +02:00
Abdón Rodríguez Davila
85398fe335 Ignore cache & build folders at ESLint 2019-07-09 15:54:42 +02:00
Alexandre BODIN
4453a03cb9
Merge pull request #3589 from strapi/fix/content-manager-parse-form-data 
Fix content manager json parsing strategy
 2019-07-09 15:25:35 +02:00
Jim LAURIE
41b78f0f4a
Fix typo double a 2019-07-09 15:09:00 +02:00
Alexandre Bodin
d30f0ca173 Fix content manager json parsing strategy 2019-07-09 14:45:52 +02:00
Berdj Abrahamian
5b2aa614e8 updated changes based on comments 
switched px for rem
removed browser prefixes
 2019-07-09 08:01:03 -04:00
Abdón Rodríguez Davila
dd18827b05 Update ESLint dependencies from monorepo 2019-07-09 13:05:35 +02:00
Abdón Rodríguez Davila
3c537bd764 Update ESLint dependencies 2019-07-09 12:56:21 +02:00
Alexandre BODIN
3c333bfdfc
Merge pull request #3585 from strapi/feature/many-way-relation 
Support many way relation
 2019-07-09 11:43:50 +02:00
Alexandre Bodin
939645f97d Support manyWay in graphql 2019-07-09 11:24:11 +02:00
Alexandre Bodin
8c5ffc9a20 Fix naming 2019-07-09 09:25:22 +02:00
Alexandre Bodin
2060ce4ca1 Test manyWay relation 2019-07-09 09:18:07 +02:00
Alexandre Bodin
1e04894262 Handle content-type-builder relation when creating a manyWay 2019-07-09 09:18:06 +02:00
Alexandre Bodin
343648988c Add manyWay support to mongoose hook 2019-07-09 09:18:06 +02:00
Alexandre Bodin
d7e9509a45 Init manWay relation 2019-07-09 09:18:05 +02:00
Alexandre Bodin
30e8a673f4 Merge branch 'master' into feature/groups 2019-07-09 09:17:31 +02:00
Alexandre Bodin
abef483bc4 v3.0.0-beta.10 v3.0.0-beta.10 2019-07-09 09:05:35 +02:00
Alexandre BODIN
39542bda80
Merge pull request #3497 from strapi/chore/strapi-new-improvments 
Improve strapi new and add create-strapi-app
 2019-07-08 18:37:13 +02:00
Alexandre Bodin
ba5fc12ff9 Add group relation example 2019-07-08 18:35:39 +02:00
Alexandre Bodin
772ddb5566 Merge branch 'master' into chore/strapi-new-improvments 2019-07-08 16:23:17 +02:00
Alexandre Bodin
90149dae59 Update wordings 2019-07-08 16:13:36 +02:00
Alexandre Bodin
99a486f112 Add missing file for npm publication 2019-07-08 15:49:51 +02:00
Alexandre Bodin
67ca0a42a7 Add more validation and better database emptyness tests 2019-07-08 15:39:08 +02:00
Alexandre BODIN
02d1e1f6e0
Merge pull request #3567 from octopuswealth/master 
Fix styling on content type builder left menu list
 2019-07-08 12:12:29 +02:00
Alexandre BODIN
ca782a3c8b
Merge branch 'master' into master 2019-07-08 12:11:49 +02:00
Alexandre Bodin
49adc5746a Merge remote-tracking branch 'origin/master' into chore/strapi-new-improvments 2019-07-08 09:21:11 +02:00
Alexandre Bodin
19531a102d Apply feedbacks 2019-07-08 09:20:52 +02:00
Alexandre BODIN
e8b75162b8
Merge pull request #3574 from strapi/inhencement/slack-badges 
Update all packages Slack badge
 2019-07-06 13:31:24 +02:00
Alexandre BODIN
8530689713
Merge branch 'master' into inhencement/slack-badges 2019-07-06 13:31:12 +02:00
Alexandre BODIN
13592c38e9
Merge pull request #3575 from strapi/improvement/hooks-doc 
Fix hook.json file name in documentation
 2019-07-06 13:30:51 +02:00
Jim LAURIE
70ff2cbd40 Fix hook.json file name 2019-07-05 18:48:02 +02:00
Alexandre BODIN
250cfac82d
Merge branch 'master' into chore/strapi-new-improvments 2019-07-05 18:41:36 +02:00
Alexandre BODIN
e6bc0b74e8
Merge branch 'master' into inhencement/slack-badges 2019-07-05 18:39:12 +02:00
Jim LAURIE
b02c4eb004 Update all packages Slack badge 2019-07-05 18:03:47 +02:00
Alexandre BODIN
110370442d
Merge pull request #3562 from jacargentina/new-operators 
Add null and not null filters
 2019-07-05 17:16:04 +02:00
Alexandre BODIN
4f44009913
Merge branch 'master' into new-operators 2019-07-05 16:55:39 +02:00
Javier Castro
83d0bc0978 feat: add _null operator 2019-07-05 10:45:14 -03:00
Alexandre BODIN
823806f867
Merge pull request #3532 from octopuswealth/trim-whitespace-aws-s3-configs 
Trimmed whitespace for AWS S3 credentials
 2019-07-05 14:54:42 +02:00