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
33,691 Commits 113 Branches 491 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alexandre Bodin
5f29e81556 Group schema + auto populate for mongoose 2019-07-04 15:27:27 +02:00
Virginie Ky
41c2feeacc unit tests clean 2019-07-04 15:27:12 +02:00
Virginie Ky
b7a8a8cbcc Some changes before PR 2019-07-04 15:19:32 +02:00
Fred Rivett
3681d354ae Fix styling on content type builder left menu list 
Previously the lists in the Content Type Builder (e.g. Content Types
section) had bullet points still. This was hard to see as they're a
similar colour to the background behind them, but could be seen more
clearly when the page had enough content to enable scrolling.

This fixes that issue.
 2019-07-04 13:50:14 +01:00
Virginie Ky
b74d080c1b back button path 2019-07-04 13:58:38 +02:00
soupette
cf19cb0960 Add submit logic 2019-07-04 13:12:27 +02:00
Louis Augry
cb4ef79d7c
Fix wording 2019-07-04 12:35:20 +02:00
soupette
2b5cc4c405 Display general form in settingsview 2019-07-04 12:24:25 +02:00
Virginie Ky
c37f9e54df Attributes list & delete attribute in GroupPage 2019-07-04 12:00:35 +02:00
soupette
2d8f520ba7 Init SettingsView 2019-07-04 11:32:51 +02:00
Oliver de Sousa
c3a989fcd3 Trimmed whitespace for AWS S3 credentials 
If you input a name/key to a bucket with a trailing whitespace, it will
respect that trailing whitespace but will then fail to find the bucket.

To resolve this, added a util function to check if it's a string. If so
it will apply the `trim()` function to remove any unwanted whitespace,
else it will return `undefined`.
 2019-07-04 09:56:38 +01:00
soupette
c0a01f1e5a Created useInjectReducer and useeInjectSaga hooks 2019-07-04 09:37:33 +02:00
Alexandre Bodin
2753176d89 Check init function exist and require it to catch eventual errors in it 2019-07-04 09:29:29 +02:00
Alexandre Bodin
b36cc373bd Merge branch 'master' into feature/groups 2019-07-04 09:19:53 +02:00
soupette
cc1dd40d82 Upgrade react-redux 2019-07-04 09:08:12 +02:00
Jim LAURIE
0b3a5e86a2
Merge pull request #3561 from strapi/fix/nav-doc 
Fix doc header's link blog & slack
 2019-07-03 13:50:25 +02:00
Alexandre Bodin
a61845b3c0 Update wordings 2019-07-03 11:20:14 +02:00
Jim LAURIE
a5e233be4c Fix doc header link blog & slack 2019-07-03 10:35:43 +02:00
Alexandre Bodin
e7a2b12146 Merge branch 'master' into chore/strapi-new-improvments 2019-07-02 17:40:17 +02:00
Alexandre Bodin
c3eaa63fb0 Add --use-npm argument to cli 2019-07-02 17:38:06 +02:00
virginieky
d576b2129a
Merge pull request #3517 from strapi/front/repeatable-homepage 
CTB - HomePage, LeftMenu and GroupPage ViewContainer
 2019-07-02 17:35:05 +02:00
Alexandre Bodin
0f565022b3 Merge branch 'master' into chore/strapi-new-improvments 2019-07-02 17:29:00 +02:00
Alexandre BODIN
b5252343cb
Merge pull request #3425 from strapi/template/discussion 
Add Github discussion template
 2019-07-02 17:11:25 +02:00
Virginie Ky
7d9dbdec31 pull branch 2019-07-02 16:14:53 +02:00
Virginie Ky
68360e774f tiny clean 2019-07-02 16:13:42 +02:00
virginieky
f5a3ccbe38
Merge branch 'develop' into front/repeatable-homepage 2019-07-02 15:52:18 +02:00
Virginie Ky
08be9e85e3 resolve conflicts 2019-07-02 15:50:19 +02:00
Virginie Ky
3d74894214 ui review apply 2019-07-02 15:47:12 +02:00
Derrick Mehaffy
51244d4a4c PR Feedback 2019-07-02 06:28:58 -07:00
DMehaffy
29ab143583 PR Feedback 2019-07-02 06:28:58 -07:00
Derrick Mehaffy
a761e39066 add tags to all templates by default 2019-07-02 06:28:58 -07:00
Derrick Mehaffy
73ec517715 add discussion template for feedback 2019-07-02 06:28:58 -07:00
Alexandre Bodin
9c1a834e27 v3.0.0-beta.9 v3.0.0-beta.9 2019-07-02 15:14:44 +02:00
Alexandre Bodin
6cad390d97 Merge branch 'master' into chore/strapi-new-improvments 2019-07-02 15:09:59 +02:00
Alexandre BODIN
cb1fee3287
Merge pull request #3555 from strapi/front/lint 
Fix front-end files lint
 2019-07-02 15:06:56 +02:00