yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-03 03:17:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,913 Commits 121 Branches 507 Tags
Commit Graph

1917 Commits

Author SHA1 Message Date
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
7c94a2316d Init strapi.service and use it where services where required 2020-01-08 17:57:53 +01:00
Virginie Ky
47e1031e29 Reviex apply in progress 2020-01-08 16:08:58 +01:00
Jim LAURIE
df1fed99ec docs: update copyright date to 2020 2020-01-08 15:41:08 +01:00
Jim LAURIE
2b2295ee78
Merge branch 'master' into feature/adminTranslationCs 2020-01-08 15:34:16 +01:00
Alexandre Bodin
a0718d7643 Fix delete many 2020-01-08 13:25:44 +01:00
Alexandre Bodin
fb25e33383 Create an entity service to share between core service and content manager 2020-01-08 11:13:38 +01:00
Alexandre BODIN
b44e4a9f64
Merge branch 'master' into hotfix/ctm-yup-schema 2020-01-08 10:51:12 +01:00
soupette
1e87172073 Fix PR feedback 2020-01-08 10:29:41 +01:00
Jaroslav Vrána
0215f64648
Merge branch 'master' into feature/adminTranslationCs 2020-01-07 19:32:32 +01:00
Jaroslav Vrána
91b0f5a990
Merge pull request #2 from profispojka/feature/adminTranslationCsWithPlugins 
Feature/admin translation cs with plugins
 2020-01-07 19:27:17 +01:00
Alexandre Bodin
f0028241c8 v3.0.0-beta.18.4 2020-01-07 17:00:28 +01:00
soupette
b399a9a26c Merge branch 'master' of github.com:strapi/strapi into hotfix/ctm-yup-schema 2020-01-07 14:55:56 +01:00
soupette
71237608a1 Improve component validation test 2020-01-07 14:55:27 +01:00
soupette
376e60331a Fix yup schema for component with min and max validations 2020-01-07 12:14:41 +01:00
Jozef Cipa
61972f6292
Merge branch 'master' into feature/slovak-translations 2020-01-06 18:22:48 +01:00
Jaroslav Vrána
4d402daf81
Merge branch 'master' into feature/adminTranslationCs 2020-01-06 15:21:45 +01:00
Virginie Ky
3a00197b6e Trigger states 2020-01-06 01:52:26 +01:00
profispojka
379033a91c
Merge branch 'feature/adminTranslationCs' into feature/adminTranslationCsWithPlugins 2020-01-05 15:59:47 +01:00
unknown
72e76c97f2 update translations to latest master 2020-01-05 15:40:09 +01:00
unknown
8281ed7a8f merge master changes 2020-01-05 14:36:47 +01:00
unknown
d53d7ac5e2 cs translation fixes 2020-01-05 13:05:57 +01:00
Virginie Ky
a094a322af EditView UI 2020-01-03 15:54:53 +01:00
cyril lopez
1c23939f43
Merge branch 'master' into fix/enumeration 2020-01-03 10:43:37 +01:00
Jaroslav Vrána
d65db853ea
Merge branch 'master' into feature/adminTranslationCs 2020-01-02 21:29:51 +01:00
Jim LAURIE
d17344211c fix: fix scroll content type fields 
On the page to customize the fileds displayed in the entry list.
The dopdown to display available fields doesn't scroll.

fix #4843
 2019-12-31 15:02:00 +01:00
virginieky
e3af0c2ab2
Merge branch 'master' into fix/enumeration 2019-12-31 12:42:35 +01:00
jozefcipa
760a3d5dd8 Add slovak translations 2019-12-30 16:22:25 +01:00
Alexandre Bodin
c2650b085c v3.0.0-beta.18.3 2019-12-23 10:17:40 +01:00
soupette
c2ee96c355 Fixes #2471 2019-12-19 15:43:07 +01:00
soupette
ee2e37c18b Fix edit component with min value when not required 2019-12-19 12:59:46 +01:00
Alexandre Bodin
8586b3dd39 v3.0.0-beta.18.2 2019-12-19 11:17:14 +01:00
cyril lopez
7b1d7ccf6a
Merge branch 'master' into improve/ctb 2019-12-18 17:59:48 +01:00
soupette
aafe92653b Add validations for biginteger 2019-12-18 17:35:05 +01:00
soupette
a54d207340 Add step any and add input text for biginteger type in the content type builder 2019-12-18 17:03:35 +01:00
soupette
d8ec27f172 Fixes #4749 2019-12-18 15:39:08 +01:00
soupette
f546dbec3b Fix icon in layout reorder 2019-12-18 14:50:41 +01:00
Alexandre Bodin
8e2fb1ff1a v3.0.0-beta.18.1 2019-12-18 09:05:32 +01:00
Alexandre Bodin
09629c11e8 v3.0.0-beta.18 2019-12-17 14:55:58 +01:00
soupette
37fab0fd90 Fix edit/delete 2019-12-17 13:37:48 +01:00
Alexandre Bodin
6aab5568f8 Fix ctm hidden fields 2019-12-17 12:33:56 +01:00
soupette
9f28c6b8c2 Fix conflicts 2019-12-17 10:20:03 +01:00
soupette
7bc4d87e36 Fixes #4629 2019-12-16 15:06:51 +01:00
soupette
dbc988f914 Fix PR feedback 2019-12-16 11:54:47 +01:00
cyril lopez
4c1cb3b7e8
Merge branch 'develop' into clean-assets 2019-12-16 11:49:32 +01:00
unknown
db412a4d3b translations 2019-12-15 17:57:16 +01:00
soupette
28986d26cc Fixes #4429 2019-12-13 18:11:34 +01:00