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

2188 Commits

Author SHA1 Message Date
soupette
aef0086337 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-02-28 07:29:58 +01:00
James Alvarez
e069cb56b4 Fixed bug #5266 
When adding new content, select field was incorrectly wrapped

Signed-off-by: James Alvarez <jp@domainwink.com>
 2020-02-28 02:21:21 +08:00
soupette
725a0940ab Fixes #5343 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-27 17:10:20 +01:00
Virginie Ky
24c07727da Replace carret with buffet icon 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-27 14:39:10 +01:00
cyril lopez
e2d54bf907
Merge branch 'develop' into fix/ctm-related-redirect 2020-02-27 12:04:43 +01:00
soupette
4c8fc44832 Fix redirect url when navigating between views 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-27 11:56:27 +01:00
soupette
caeeb97f7d Fixes #3247 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-27 11:35:35 +01:00
soupette
9c638f5351 Fixes #5053 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-27 11:20:04 +01:00
HichamELBSI
6821fe8d63 Fix PR feedbacks 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-26 17:33:18 +01:00
HichamELBSI
48f5c5f418 Fix PR feedbacks 2020-02-26 14:53:32 +01:00
Alexandre Bodin
3bcbde8f0b v3.0.0-beta.18.8 2020-02-26 12:01:37 +01:00
Virginie Ky
83fb72736f Merge branch 'front/media-lib-filters' of github.com:strapi/strapi into front/media-library-filter 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-26 03:34:04 +01:00
HichamELBSI
e450d3613b Add UID in CTM 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-25 21:44:02 +01:00
Virginie Ky
7bc9b987f7 Filter button with translation 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-25 14:40:52 +01:00
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