yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-01 18:33:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,868 Commits 121 Branches 507 Tags
Commit Graph

2174 Commits

Author SHA1 Message Date
Alexandre Bodin
f0d86ed2f7 Uses defaultValue as slug when possible 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-21 10:13:49 +01:00
Ky
f16b9c0ed6 search 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-02-20 22:49:51 +01:00
HichamELBSI
265494803a Fix PR comments 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-20 14:28:37 +01:00
HichamELBSI
cc6a35551b Add single type navigation 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-20 11:53:57 +01:00
Alexandre Bodin
c1ac8b0106 Add apiId to get content type 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-20 11:44:35 +01:00
Alexandre Bodin
032b741751 Merge branch 'develop' into features/single-types 2020-02-19 15:05:22 +01:00
Alexandre Bodin
3cb66f6566 Update snapshots 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-19 12:16:59 +01:00
Alexandre Bodin
193bd5af0e Add apiId in content type infos 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-19 11:02:20 +01:00
Alexandre Bodin
db03d9d07d Add UID validation routes for CTM livechecks 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-19 10:54:44 +01:00
soupette
56db05845b Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-02-19 05:50:51 +01:00
soupette
6d384ddb6a Fixes #5260 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-18 14:31:28 +01:00
Alexandre Bodin
f6cf06d22c Add notNull validator for edition 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-18 09:02:48 +01:00
Alexandre Bodin
ae6049be73 Use yup transform to cast some values 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-17 16:14:29 +01:00
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
cyril lopez
021f88c88f
Merge pull request #5241 from strapi/front/trash-icon 
Generalize all trash icon
 2020-02-13 13:31:07 +01:00
soupette
6ff1ef77e8 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-listview 2020-02-13 13:03:40 +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
Virginie Ky
138bbae981 generalize all trash icons 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-13 11:29:01 +01:00
soupette
81578007cd Design controls 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-13 11:17:32 +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
cyril lopez
56ab6442dc
Merge branch 'develop' into chore/ctm-remove-redux-saga 2020-02-13 10:17:40 +01:00
soupette
f5f84afd70 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-listview 2020-02-13 10:17:05 +01:00
soupette
4a344d1212 Created HeaderSearch component and add it to the ctm 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-13 10:02:45 +01:00
soupette
be4954a7e8 Move Filter icon in helper plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-13 09:39:20 +01:00
HichamELBSI
fc1541330b Fix after PR comments 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-12 17:54:16 +01:00
Virginie Ky
f152ea9af9 Merge branch 'develop' into front/ui-improvements 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-12 13:55:13 +01:00
Virginie Ky
d75247f441 trash icons ip 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-12 12:24:35 +01:00
soupette
f5a2ddc98d Merge branch 'chore/ctm-remove-redux-saga' of github.com:strapi/strapi into chore/ctm-remove-redux-saga 2020-02-12 10:37:19 +01:00
soupette
57d01a8031 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-12 10:36:37 +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
virginieky
0bacc59641
Merge branch 'develop' into chore/ctm-remove-redux-saga 2020-02-11 15:16:54 +01:00
soupette
662a79d080 Remove saga from listview 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-11 14:02:03 +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
30fba6d3fe Remove saga from Main container 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-10 15:27:49 +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
8b5cc90cd3
Merge pull request #5192 from strapi/front/ctm-filters-btn-ui 
CTM filters btn ui
 2020-02-06 15:02:34 +01:00
cyril lopez
8745d2373a
Merge branch 'master' into feat/update-pl-translations 2020-02-06 14:39:05 +01:00
Virginie Ky
159521a8de fix filters button position 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-06 14:30:09 +01:00