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

1994 Commits

Author SHA1 Message Date
Alexandre Bodin
37b184d063 Fix test 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-17 15:54:49 +01:00
Alexandre Bodin
77b1a2944b Add mongoose uid type 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-13 16:46:37 +01:00
Alexandre Bodin
3b41eb6230 Add uid type to bookshelf column generator and init tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-13 11:36:26 +01:00
Alexandre Bodin
8a6c48eb14 Merge branch 'develop' into features/single-types 2020-02-13 11:36:07 +01:00
cyril lopez
035265b3fd
Merge pull request #5226 from strapi/single-types/left-menu 
Reskin and refacto the left admin menu and add Single type section
 2020-02-13 10:27:37 +01:00
HichamELBSI
fc1541330b Fix after PR comments 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-12 17:54:16 +01:00
Alexandre Bodin
5e79e9c275 Add appropriate tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-11 18:15:56 +01:00
Alexandre Bodin
aff529d09e Check db count when switching kind 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-11 18:15:56 +01:00
soupette
f924a53a8a Add pluginLogo to the plugin object in order to prevent fetching the logo from github 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-11 17:15:53 +01:00
HichamELBSI
4f5cd5a209 Reskin and refacto the left admin menu and add Single type section 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-11 17:13:31 +01:00
Alexandre Bodin
c0bf015eb6 Refactor core api and add tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:36 +01:00
Alexandre Bodin
0a1d7c77db Add tests for CORE api single-types 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:36 +01:00
Alexandre Bodin
de9521ce6b Merge branch 'develop' into features/single-types 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:09:50 +01:00
Alexandre Bodin
8a970562c9 Merge branch 'master' into develop 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 19:15:20 +01:00
soupette
b86b584539 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-10 10:24:12 +01:00
soupette
d58cbdc3c4 Fixes #5091 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-07 15:55:23 +01:00
HichamELBSI
f534ec32a9 Update list item limitation 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-07 14:48:32 +01:00
Jim LAURIE
638ddd201e
Merge branch 'master' into update-zh-hans-translations 2020-02-07 09:56:09 +01:00
cyril lopez
3a8e79817f
Merge branch 'develop' into fix/select-relations 2020-02-06 15:16:31 +01:00
cyril lopez
8745d2373a
Merge branch 'master' into feat/update-pl-translations 2020-02-06 14:39:05 +01:00
HichamELBSI
6fff7fcf46 Merge branch 'develop' into features/single-types 2020-02-06 14:11:44 +01:00
HichamELBSI
98871fcb46 Merge branch 'develop' into features/single-types 2020-02-05 16:41:30 +01:00
ruibaby
ff489ce051 feat: updated zh-Hans translations. 
Signed-off-by: ruibaby <i@ryanc.cc>
 2020-02-04 15:55:02 +08:00
soupette
6cf54385ca Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-03 16:43:12 +01:00
soupette
5e9af4c36c Remove styled-compo dependency from content manager 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-03 15:34:44 +01:00
Virginie Ky
bb9ff9e47a Merge branch 'master' into develop 2020-01-31 15:10:07 +01:00
Hicham EL ABBASSI
90a60879c5 Update all translations 
Signed-off-by: Hicham EL ABBASSI <hichamelabbassi@MacBook-Pro-de-Hicham.local>
 2020-01-31 09:59:10 +01:00
HichamELBSI
7622874fb0 Fix translations 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-01-30 18:26:35 +01:00
Hicham EL ABBASSI
597a88a650 Update all translations 
Signed-off-by: Hicham EL ABBASSI <hichamelabbassi@MacBook-Pro-de-Hicham.local>
 2020-01-30 18:26:35 +01:00
soupette
9c53fcaccc Fix select relations 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-30 18:09:55 +01:00
Alexandre Bodin
761ad68392 v3.0.0-beta.18.7 2020-01-30 16:15:25 +01:00
Alexandre Bodin
576279626b Merge branch 'develop' into features/single-types 2020-01-29 11:59:53 +01:00
Alexandre Bodin
b999bea3a9 Merge branch 'master' into develop 2020-01-29 11:59:41 +01:00
Virginie Ky
4ff189ac00 Merge branch 'master' into develop 2020-01-29 11:35:55 +01:00
Hicham EL ABBASSI
81c5537d7f Merge branch 'develop' into features/single-types 2020-01-29 10:09:46 +01:00
Alexandre BODIN
3c59a05154
Merge pull request #5100 from strapi/fix/main-field-exclude-id 
Fix main field set to id on mongo
 2020-01-27 12:14:16 +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
Alexandre Bodin
d0c26fef67 Fix main field set to id on mongo 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-27 09:53:19 +01:00
soupette
96e092b300 Change the way we load plugins 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-23 16:46:50 +01:00
soupette
af4bee9b8e Fixes #5054 
Signed-off-by: soupette <>
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-23 15:44:47 +01:00
Alexandre Bodin
1106c07795 v3.0.0-beta.18.6 2020-01-23 08:13:13 +01:00
Mariusz Wachowski
4e5326490e feat: updated pl translations 
Signed-off-by: Mariusz Wachowski <wachowski.mariusz@gmail.com>
 2020-01-22 21:54:08 +01:00
Alexandre Bodin
9c96b180fe Merge branch 'develop' into features/single-types 2020-01-22 10:39:42 +01:00
soupette
d0c3a0ddb7 Merge branch 'chore/eslint-config-front' of github.com:strapi/strapi into chore/eslint-config-front 2020-01-21 18:36:20 +01:00
soupette
489c7b2324 Fix lint 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 18:34:27 +01:00
cyril lopez
b5f2824f6d
Merge branch 'master' into chore/eslint-config-front 2020-01-21 18:00:52 +01:00
soupette
cd03d672c2 Fix lint 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 17:53:21 +01:00
soupette
ca1e82337c Fixes #5019 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 17:09:03 +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