yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-06 05:44:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,648 Commits 106 Branches 501 Tags
Commit Graph

1325 Commits

Author SHA1 Message Date
soupette
5909b2c222 Merge branch 'features/media-lib' of github.com:strapi/strapi into core/admin-field-api 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 17:41:54 +01:00
soupette
307fcb5b41 Merge branch 'features/media-lib' of github.com:strapi/strapi into core/admin-field-api 2020-03-05 16:21:46 +01:00
virginieky
7583b035a9
Merge branch 'features/media-lib' into front/media-library-filter 2020-03-05 14:48:55 +01:00
soupette
3f8a487fab Created field API and added it to the content manager 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 14:43:00 +01:00
Alexandre Bodin
e1a7074a4e Merge branch 'develop' into features/media-lib 2020-03-05 14:39:29 +01:00
Alexandre Bodin
b3e18e1de6 v3.0.0-beta.19.2 2020-03-05 14:32:42 +01:00
soupette
f1de079d77 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 10:22:49 +01:00
Alexandre Bodin
8e91e5abaf v3.0.0-beta.19.1 2020-03-04 18:42:31 +01:00
Virginie Ky
14e7e07c23 Merge branch 'features/media-lib' of github.com:strapi/strapi into front/media-library-filter 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-04 17:17:36 +01:00
soupette
d6bc4e1941 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 14:52:29 +01:00
Alexandre Bodin
e222792181 v3.0.0-beta.19 2020-03-04 14:24:23 +01:00
HichamELBSI
b5947621fc Merge branch 'master' into develop 2020-03-04 09:32:13 +01:00
Virginie Ky
f50a5b1b66 Merge branch 'features/media-lib' of github.com:strapi/strapi into front/media-library-filter 2020-03-03 14:44:07 +01:00
Alexandre Bodin
7a8c865051 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 15:18:08 +01:00
Virginie Ky
98b305c481 url update fix and avoid several identical filters 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-01 21:28:26 +01:00
HichamELBSI
92632be70d Fix all single types feedback 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-28 16:03:38 +01:00
Virginie Ky
4c6e50439d override dateFormats and getFilterType tests 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-28 12:44:15 +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
301893cb5e remove filter 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-26 10:44:27 +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
0fc0783770 handleChange as a single function 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-25 21:34:22 +01:00
Virginie Ky
9f354b05bb apply PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-25 21:15:26 +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
Ky
5a8dc4c49f update tests 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-02-21 01:01:43 +01:00
Ky
f16b9c0ed6 search 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-02-20 22:49:51 +01:00
soupette
cefd6c37a1 Fix menu hooks call 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 12:51:22 +01:00
soupette
5ff19144b1 Remove useless compo 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 10:00:49 +01:00
soupette
de10305b32 Created new modal header component 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 07:58:59 +01:00
soupette
3cd1ab6a3d Add loading indicator 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-19 08:10:40 +01:00
soupette
978559c6ce Init stepper in modal 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-18 16:39:03 +01:00
soupette
7b752d1ce3 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-17 07:54:37 +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
f534ec32a9 Update list item limitation 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-07 14:48:32 +01:00
HichamELBSI
bd284f0637 Fix list max height 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-06 16:00:49 +01:00
HichamELBSI
6fff7fcf46 Merge branch 'develop' into features/single-types 2020-02-06 14:11:44 +01:00
soupette
d8f0edf5b1 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-06 12:05:17 +01:00
HichamELBSI
98871fcb46 Merge branch 'develop' into features/single-types 2020-02-05 16:41:30 +01:00
soupette
c86e1dfb18 Update front-end jest config 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-03 16:03:36 +01:00
soupette
451589f875 Upgrade buffet.js with the next version 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-03 15:43:44 +01:00
soupette
f74082af33 Upgrade to styled-compo v5 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-03 15:36:59 +01:00
cyril lopez
89ee8df680
Merge branch 'develop' into core/admin-settings-api 2020-02-03 11:39:10 +01:00
soupette
3473143813 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-31 17:14:24 +01:00
Alexandre Bodin
283a0db1ed Upgrade rimraf 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-31 16:56:50 +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