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

8211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Virginie Ky
b4252ec91f Unit tests 2019-07-09 16:51:53 +02:00
Virginie Ky
a747d35c78 Unit tests 2019-07-09 16:49:19 +02:00
virginieky
a5a9319ba9
Merge branch 'develop' into front/repeatable-fieldslist 2019-07-09 09:56:11 +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
Virginie Ky
b6a5ae5644 Review apply 2019-07-08 18:58:29 +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
61fc2ca7dc fix lint 2019-07-08 10:20:44 +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
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
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
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
soupette
c0a01f1e5a Created useInjectReducer and useeInjectSaga hooks 2019-07-04 09:37:33 +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
Jim LAURIE
a5e233be4c Fix doc header link blog & slack 2019-07-03 10:35:43 +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
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
cb1fee3287
Merge pull request #3555 from strapi/front/lint 
Fix front-end files lint
 2019-07-02 15:06:56 +02:00
Alexandre Bodin
0df8873401 Remove overrides after fixing them all 2019-07-02 14:45:47 +02:00
soupette
729e7d4756 Update lint conf 2019-07-02 14:44:13 +02:00
soupette
6d7c1b90ac Fix lint 2019-07-02 14:44:13 +02:00
Alexandre BODIN
cf7e1185da
Merge pull request #3454 from strapi/quickstart-revision 
Update getting started documentation with beta specific content
 2019-07-02 14:43:19 +02:00
Alexandre Bodin
3d70524721 Merge branch 'master' into quickstart-revision 2019-07-02 14:42:27 +02:00
Alexandre BODIN
5c71335ad1
Merge pull request #3475 from strapi/aws-deploy-docs-updates 
Update AWS and Digital Ocean depoyment documentation
 2019-07-02 14:38:54 +02:00
cyril lopez
719291d0b1
Merge branch 'master' into aws-deploy-docs-updates 2019-07-02 14:20:52 +02:00
Alexandre BODIN
66ba52b3f5
Merge branch 'master' into quickstart-revision 2019-07-02 13:57:45 +02:00
Alexandre BODIN
d372d132c1
Merge pull request #3356 from henrych4/fix-removal-of-double-quotes 
Fix removal of double quotes in string/text fields
 2019-07-02 13:56:36 +02:00
davidkartuzinski
7aaeeb922d edited and clarified a few points. Changed incorrect usage of 'Node.js' 2019-07-02 13:29:49 +02:00