yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-15 20:27:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,273 Commits 117 Branches 489 Tags
Commit Graph

9273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
soupette
afd8b41e13 Handle edit infos 2019-07-05 16:27:04 +02:00
soupette
7cf9821f8c Handle add field 2019-07-05 15:45:16 +02:00
Javier Castro
83d0bc0978 feat: add _null operator 2019-07-05 10:45:14 -03:00
soupette
def17631ca Handle remove label 2019-07-05 15:24:30 +02:00
soupette
832abba48a Init sort 2019-07-05 14:59:31 +02: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
soupette
00cea393eb Handle submit for settingviewmodel 2019-07-05 11:01:53 +02:00
soupette
de9ee49878 Init SettigViewModel 2019-07-05 09:41:14 +02:00
soupette
cb9599d405 fix lint 2019-07-04 19:04:48 +02:00
soupette
fcc9c169e5 Fix conflicts 2019-07-04 18:54:09 +02:00
soupette
9b5dd83117 Fix conflicts 2019-07-04 18:50:31 +02:00
soupette
61fb728986 Fix conflicts 2019-07-04 18:43:30 +02:00
soupette
a8d5eacc84 Created dedicated settings view 2019-07-04 18:28:57 +02:00
Alexandre Bodin
5a9610af73 Merge branch 'master' into chore/strapi-new-improvments 2019-07-04 17:58:12 +02:00
Alexandre Bodin
52a38e36db Merge branch 'master' into feature/groups 2019-07-04 17:57:51 +02:00
Alexandre BODIN
94fd13794e
Merge branch 'master' into trim-whitespace-aws-s3-configs 2019-07-04 16:22:22 +02:00
Alexandre BODIN
596f0d33da
Merge pull request #3564 from LouisAugry/patch-1 
Fix deployment typo fix
 2019-07-04 16:19:58 +02:00
soupette
8052117d44 Fix row links 2019-07-04 15:56:42 +02:00
soupette
0212ce01e3 Fix block css 2019-07-04 15:39:20 +02:00