yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-30 19:05:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,371 Commits 120 Branches 499 Tags
Commit Graph

1742 Commits

Author SHA1 Message Date
soupette
d6bc4e1941 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 14:52:29 +01:00
soupette
467afcb7e6 Fix baseline 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-03 18:46:43 +01:00
Virginie Ky
f266baa396 PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-03 17:49:30 +01:00
Alexandre Bodin
d79053c6bc Remove file that was deleted in develop branch 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 16:46:25 +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
soupette
63c284cc64 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-02 11:38:55 +01:00
soupette
3a695aeaac Merge branch 'develop' of github.com:strapi/strapi into chore/remove-saga-admin 2020-03-02 11:34:01 +01:00
Alexandre BODIN
3ba0d7aed3
Merge branch 'develop' into features/single-types 2020-03-02 09:20:32 +01:00
helabbassi
7363cc01a8 Fix snapshot tests 
Signed-off-by: helabbassi <helabbassi@kilix.fr>
 2020-03-02 08:47:05 +01:00
HichamELBSI
92632be70d Fix all single types feedback 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-28 16:03:38 +01:00
soupette
185e1adc40 Fix tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 14:35:25 +01:00
soupette
ca93021bd0 Remove saga in admin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 14:15:56 +01:00
soupette
8b25ad614b Add tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 13:56:06 +01:00
soupette
d3fc7ad835 Refacto ListPluginsPage 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 13:43:45 +01:00
soupette
ccc92b90a5 Add required info into the plugin object and update plugin generator 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 11:40:55 +01:00
soupette
8b883ba8b7 Created common useFetchPlugins 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 10:59:42 +01:00
soupette
f3fa43b9d4 Add tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 10:41:10 +01:00
Virginie Ky
5b4185ec42 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-28 10:16:23 +01:00
Virginie Ky
56caadc3c2 update snapshots 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-28 09:54:37 +01:00
soupette
0388705816 Remove old files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 09:32:00 +01:00
soupette
b7c09a816d Remove sage from Marketplace 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 09:29:12 +01:00
HichamELBSI
6821fe8d63 Fix PR feedbacks 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-26 17:33:18 +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
Virginie Ky
45c8deac4d Merge branch 'front-media-lib-search' of github.com:strapi/strapi into front/media-lib-filters 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-25 22:09:01 +01:00
HichamELBSI
e450d3613b Add UID in CTM 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-25 21:44:02 +01:00
virginieky
85cf0468d1
Merge branch 'features/media-lib' into front-media-lib-search 2020-02-25 21:16:52 +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
soupette
9abb0e6d7f Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-crop-new-asset 2020-02-24 16:25:29 +01:00
soupette
6ee156f3cc Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-24 10:58:46 +01:00
soupette
3b99cfa381 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-crop-new-asset 2020-02-24 10:41:27 +01:00
soupette
2838d145b0 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-settings 2020-02-24 10:40:56 +01:00
soupette
0ee70bcc35 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-02-24 10:39:43 +01:00
Ky
65c8968b84 clean 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-02-22 12:01:07 +01:00
Ky
783b3f1a36 theme 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-02-22 11:46:54 +01:00
Alexandre Bodin
9c39efecdc Merge branch 'develop' into features/single-types 2020-02-21 11:57:11 +01:00
Alexandre Bodin
bd53103e06 Merge branch 'master' into develop 2020-02-21 11:56:59 +01:00
soupette
11a2b3bbfc Design edit modal 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-21 07:58:14 +01:00
soupette
074d30ccfb Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-settings 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 13:49:19 +01:00
soupette
1a4ca1fcec Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-02-20 13:44:21 +01:00
HichamELBSI
cc6a35551b Add single type navigation 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-20 11:53:57 +01:00
soupette
f0231154f3 improve design upload list 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 09:52:29 +01:00
soupette
51b7d75cdd Improve Modal components 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 09:02:51 +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
f128edc73a Add font-sizes and font-weight to the theme 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 07:11:20 +01:00
soupette
bf6a2464ab Add setting link 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-19 16:52:58 +01:00
soupette
09d1a6af3a Add option to add a link into the global setting section 2020-02-19 16:30:53 +01:00
Alexandre Bodin
032b741751 Merge branch 'develop' into features/single-types 2020-02-19 15:05:22 +01:00
Alexandre Bodin
614d550742 Merge branch 'master' into develop 2020-02-19 15:04:09 +01:00
Toms Burgmanis
26d6687940
Merge branch 'master' into patch-1 2020-02-19 01:41:06 +02:00