yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-01 11:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,371 Commits 120 Branches 500 Tags
Commit Graph

1742 Commits

Author SHA1 Message Date
HichamELBSI
abbb045277 Edit single type options 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-06 14:13:48 +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
soupette
7adc97b269 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-06 11:54:02 +01:00
HichamELBSI
98871fcb46 Merge branch 'develop' into features/single-types 2020-02-05 16:41:30 +01:00
Virginie Ky
33ce7dc7cd Merge branch 'develop' into front/ui-improvements 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-05 16:05:50 +01:00
Virginie Ky
b2b4a3382e Merge branch 'front/ui-improvements' into front/popupwarning 2020-02-05 10:32:15 +01:00
Virginie Ky
fd9fe6c6fd Merge branch 'develop' into front/ui-improvements 2020-02-05 10:08:24 +01:00
Virginie Ky
3bef28a36b Merge branch 'master' into develop 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-05 10:07:46 +01:00
Virginie Ky
a31b63187f administrator back button url 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-04 15:54:05 +01:00
Virginie Ky
c3ce67b418 Revert "back button url fix" 
This reverts commit fd11d655d7e73e7796a8ebf4759c3c6658f19011.

Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-04 15:54:04 +01:00
Virginie Ky
0bd50b47f6 back button url fix 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-04 15:54:03 +01:00
Virginie Ky
232131faac update snapshots waiting for jest config 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-04 09:56:50 +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
24630ebd02 Remove snapshots 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-03 16:51:35 +01:00
soupette
6cf54385ca Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-03 16:43:12 +01:00
soupette
b6d0c5dc7b Add snaps back 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-03 16:06:16 +01:00
soupette
c91254b1aa Remove snapshots 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-03 15:31:08 +01:00
soupette
f3c6472f4a Update snap 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-03 11:51:23 +01:00
Virginie Ky
995ba8d8b3 popup warning snapshots 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-31 19:04:49 +01:00
soupette
86a411812f Update snapshots required since new component logic 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-31 17:30:42 +01:00
soupette
3473143813 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-31 17:14:24 +01:00
Virginie Ky
37657e1811 Merge branch 'front/ui-improvements' into front/popupwarning 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-31 15:51:02 +01:00
virginieky
da6462f2ad
Merge branch 'develop' into front/ui-improvements 2020-01-31 15:43:55 +01:00
Virginie Ky
9c67340e42 Merge branch 'master' into develop 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-31 15:19:53 +01:00
Virginie Ky
6d5a4042b1 Merge branch 'front/ui-improvements' into front/popupwarning 2020-01-31 15:17:33 +01:00
Virginie Ky
fdfd49a805 Merge branch 'develop' into front/ui-improvements 2020-01-31 15:10:28 +01:00
Virginie Ky
bb9ff9e47a Merge branch 'master' into develop 2020-01-31 15:10:07 +01:00
Virginie Ky
15eabaff39 add index to editview utils 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-31 14:37:28 +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
Virginie Ky
2af7111289 invert values in EventInput formatValue unit test 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-30 18:44:01 +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
4153fe9b7b Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-30 18:18:35 +01:00
Virginie Ky
896a15ca84 Merge branch 'webhooks/tests' of github.com:strapi/strapi into webhooks/tests 2020-01-30 18:00:52 +01:00
virginieky
5acbb26573
Merge branch 'master' into webhooks/tests 2020-01-30 17:03:27 +01:00
Virginie Ky
3fc527712b eventinput methods tests 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-30 17:02:11 +01:00
virginieky
8b62d3c34d
Merge branch 'master' into webhooks/tests 2020-01-30 15:52:46 +01:00
cyril lopez
eb6fc3578d
Merge branch 'master' into fix/5038 2020-01-30 15:41:27 +01:00
Virginie Ky
ec0e6252a4 apply code review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-30 15:32:47 +01:00
soupette
adc06abf06 Merge branch 'develop' of github.com:strapi/strapi into core/admin-settings-api 2020-01-30 14:46:16 +01:00
soupette
12d59c4b91 Merge branch 'master' of github.com:strapi/strapi into develop 2020-01-30 14:45:52 +01:00
soupette
0a33e3ade5 Add documentation about the settings api 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-30 14:42:53 +01:00
soupette
22aed6c934 Made settingsBaseURL global constant 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-30 13:51:52 +01:00
soupette
a49d696c51 Fix routing and menu highlight 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-30 12:32:29 +01:00
soupette
144d07cdbe Improve plugin left menu for trads and enable settings api 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-30 11:50:34 +01:00
soupette
b94d1a6a08 Prevent plugin with no mainComponent from being injected into the left menu 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-30 10:31:52 +01:00
Virginie Ky
6ac7a96ef8 apply PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-29 19:27:26 +01:00
Virginie Ky
2631cd3c49 standardise code style 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-29 17:44:51 +01:00
Virginie Ky
962602a1e7 Register form ui 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-29 15:36:32 +01:00