yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-31 20:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,947 Commits 113 Branches 491 Tags
Commit Graph

8947 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Virginie Ky
a747d35c78 Unit tests 2019-07-09 16:49:19 +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
soupette
b716fa49b8 Fix tests 2019-07-09 13:33:34 +02: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
soupette
ea32c05976 Created filterpicker 2019-07-09 12:31:18 +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
virginieky
a5a9319ba9
Merge branch 'develop' into front/repeatable-fieldslist 2019-07-09 09:56:11 +02:00
soupette
ba6631d1e3 Display labels picker 2019-07-09 09:53:50 +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
Virginie Ky
8b9eeee3a3 model page clean 2019-07-09 08:59:16 +02:00
Virginie Ky
d0d2198ad2 Models attributes list 2019-07-09 08:57:39 +02:00
Evan Owens
619a7761e9
Clarify model associations 
Make it a little more clear that models can belong to the current project or another plugin.
 2019-07-09 07:56:59 +09:00
soupette
a733571e32 Fix getdata records, loaders 2019-07-08 20:27:38 +02:00
Virginie Ky
b6a5ae5644 Review apply 2019-07-08 18:58:29 +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
soupette
d0482f45a3 Init list view 2019-07-08 17:01:12 +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
soupette
79b6f15aa5 Merge branch 'develop' of github.com:strapi/strapi into ctm/repeatable-setting-view 2019-07-08 15:47:59 +02:00
soupette
c088a96560 Add dnd sort for list 2019-07-08 15:45:11 +02:00
Alexandre Bodin
67ca0a42a7 Add more validation and better database emptyness tests 2019-07-08 15:39:08 +02:00
Louis Augry
a3fe9d5a38 Fix documention typo 2019-07-08 15:10:17 +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
virginieky
45e169526e
Merge pull request #3570 from strapi/ctm/repeatable 
Content Manager - Settings View
 2019-07-08 12:08:24 +02:00
soupette
a481f3a059 upgrade react-dnd dependencies 2019-07-08 11:41:11 +02:00
soupette
1bde7047a7 Merge branch 'ctm/repeatable' of github.com:strapi/strapi into ctm/repeatable-setting-view 2019-07-08 10:24:09 +02:00
soupette
61fc2ca7dc fix lint 2019-07-08 10:20:44 +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