yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-26 00:39:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,228 Commits 129 Branches 498 Tags
Commit Graph

1536 Commits

Author SHA1 Message Date
Alexandre Bodin
5d1565bdd3 Merge branch 'master' of github.com:strapi/strapi 2020-01-30 16:19:21 +01:00
Alexandre Bodin
761ad68392 v3.0.0-beta.18.7 2020-01-30 16:15:25 +01:00
cyril lopez
eb6fc3578d
Merge branch 'master' into fix/5038 2020-01-30 15:41:27 +01:00
Alexandre Bodin
4f5a0e7679 Cleanup eslint configs 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-27 10:49:57 +01:00
soupette
0b81207d74 Merge branch 'master' of github.com:strapi/strapi into fix/5038 2020-01-27 09:43:49 +01:00
Alexandre Bodin
1106c07795 v3.0.0-beta.18.6 2020-01-23 08:13:13 +01:00
soupette
a9c9549458 Fixes #5038 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-22 12:14:17 +01:00
soupette
be64adaa1c Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-22 10:29:36 +01:00
soupette
489c7b2324 Fix lint 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 18:34:27 +01:00
cyril lopez
a6ac47afd9
Merge branch 'master' into chore/ctb-front-end-tests 2020-01-21 17:24:27 +01:00
soupette
c2f238fabc Add new line before if rule 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 16:44:57 +01:00
soupette
eb00b7e0ea Add newline-before-return rule 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 16:31:05 +01:00
soupette
2a4351794b Fix lint webhooks 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 16:25:14 +01:00
soupette
b3ba8c27ef Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 16:12:46 +01:00
soupette
f50f89f0a8 Update eslint configuration 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 16:03:31 +01:00
Alexandre Bodin
2ee13c0a12 v3.0.0-beta.18.5 2020-01-21 15:44:44 +01:00
virginieky
f76e33cba1
Merge branch 'master' into chore/ctb-front-end-tests 2020-01-21 12:21:20 +01:00
Alexandre Bodin
daaf1392d2 Merge branch 'master' into develop 2020-01-21 11:46:04 +01:00
virginieky
f6f573445c
Merge branch 'master' into chore/ctb-front-end-tests 2020-01-20 16:59:52 +01:00
cyril lopez
7ccd012ada
Merge pull request #4962 from strapi/front/webhooks-editview 
Front/webhooks editview
 2020-01-17 18:59:50 +01:00
Patai Adam
3f0034bc32
Merge branch 'master' into fix/remove-auto-populate 2020-01-17 14:15:16 +01:00
Patai Adam
c290e37470
Update content-type-builder.js 2020-01-17 14:08:58 +01:00
Alexandre Bodin
ab8d2c5d77 Merge branch 'develop' into features/webhooks 2020-01-16 16:55:27 +01:00
soupette
6ea595110b Apply PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-16 16:08:39 +01:00
Virginie Ky
4add71d56b CTB sublist button UI fix 2020-01-16 15:26:30 +01:00
Alexandre Bodin
3bca612ac1 Refactor tests and add codecov 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-16 14:06:03 +01:00
soupette
da4c9d5330 Merge branch 'master' of github.com:strapi/strapi into chore/ctb-front-end-tests 2020-01-15 14:50:43 +01:00
soupette
451e1e6de8 Add tests for FormModal reducer 2020-01-15 14:47:54 +01:00
soupette
16a6975af1 Fix add compo to dz action 2020-01-15 12:35:26 +01:00
soupette
e13e8e242b Add tests for internal relations 2020-01-15 12:01:05 +01:00
soupette
7c7813a787 Init relations tests 2020-01-14 17:14:46 +01:00
soupette
1f85288c63 Add tests for removing a field from a content type 2020-01-14 16:01:27 +01:00
soupette
3db763340c Add tests for all relations 2020-01-14 15:30:14 +01:00
Patai Adam
3bce61005a
Merge branch 'master' into fix/remove-auto-populate 2020-01-14 15:06:21 +01:00
soupette
1e3c3d9736 Add test for adding a relation with another ct 2020-01-14 15:01:43 +01:00
Adam Patai
1fafec7ab8 Handle reverse relations 2020-01-14 12:44:55 +01:00
soupette
c577097994 Add test for adding a compo and a dz 2020-01-14 12:31:39 +01:00
Adam Patai
3044a7495e Keep autoPopulate field if it was already set to true 2020-01-14 10:20:27 +01:00
soupette
0a2dffc1d4 Fix conflicts 2020-01-14 09:35:34 +01:00
soupette
bfe37c73c9 Fix conflicts 2020-01-13 11:39:08 +01:00
Virginie Ky
fb7017c3ea Merge branch 'features/webhooks' of github.com:strapi/strapi into front/webhooks-editview 2020-01-13 10:19:14 +01:00
Alexandre Bodin
dcc29b361b Merge branch 'develop' into features/webhooks 2020-01-13 09:41:20 +01:00
virginieky
50643f94b3
Merge branch 'master' into chore/eslint-config 2020-01-10 17:44:43 +01:00
Patai Adam
3b7dc6dde5
Update content-type-builder.js 2020-01-10 09:58:47 +01:00
Virginie Ky
4aeb5399ee Merge branch 'features/webhooks' of github.com:strapi/strapi into front/webhooks-editview 2020-01-09 11:11:32 +01:00
Alexandre Bodin
f28292b384 Merge branch 'develop' into features/webhooks 2020-01-09 11:09:26 +01:00
Virginie Ky
d0650f1884 Conflicts resolved 2020-01-09 11:05:46 +01:00
Alexandre BODIN
a427c27cfd
Merge pull request #4947 from strapi/fix/use-strapi-service 
Use strapi.services instead of requires to allow overrides
 2020-01-09 10:13:05 +01:00
Alexandre BODIN
c5cef7dcbb fix - keep autoPopulate:false options on edit 2020-01-08 19:00:12 +01:00
Alexandre Bodin
7c94a2316d Init strapi.service and use it where services where required 2020-01-08 17:57:53 +01:00