yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-11 18:27:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,408 Commits 115 Branches 488 Tags
Commit Graph

352 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Virginie Ky
3fc527712b eventinput methods tests 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-30 17:02:11 +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
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
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
5a9e17e0c0 rename HeadersInput tests 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-29 10:12:54 +01:00
Virginie Ky
dd96bc90fa Snapshots 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-28 16:07:01 +01:00
Virginie Ky
b25daf2163 Snapshots with globalcontext and translation 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-27 18:32:57 +01:00
Virginie Ky
ab85b7642e Merge branch 'webhooks/tests' of github.com:strapi/strapi into webhooks/tests 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-22 18:11:12 +01:00
Virginie Ky
22fa1a963a snapshots 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-22 17:47:09 +01:00
cyril lopez
51c33144c6
Merge branch 'master' into webhooks/tests 2020-01-22 17:26:29 +01:00
soupette
489c7b2324 Fix lint 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 18:34:27 +01:00
Virginie Ky
00b664ea61 headersInput tests 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-21 17:29:39 +01:00
soupette
eb00b7e0ea Add newline-before-return rule 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 16:31:05 +01:00
soupette
2a4351794b Fix lint webhooks 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 16:25:14 +01:00
soupette
b3ba8c27ef Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 16:12:46 +01:00
Virginie Ky
dfd6c51ca8 Merge branch 'master' of github.com:strapi/strapi into webhooks/tests 2020-01-21 16:06:28 +01:00
Virginie Ky
06d05014bd headersinput tests ip 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-21 16:06:05 +01:00
soupette
f50f89f0a8 Update eslint configuration 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 16:03:31 +01:00
Virginie Ky
3747f3e516 media update disabled comment 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-20 16:43:37 +01:00
Virginie Ky
f47523302c Disabled events 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-20 16:31:56 +01:00
Virginie Ky
bfe0cf321e remove onblur 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-20 15:59:25 +01:00
Virginie Ky
b828f06add trigger button headers errors and notification translation 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-20 15:22:30 +01:00
Virginie Ky
f36b1c6288 remove events onblur effect 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-17 20:20:57 +01:00
Virginie Ky
af578e9df7 log remove 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-17 18:21:26 +01:00
Virginie Ky
e444cf0119 events input ref 2020-01-17 17:20:27 +01:00
Virginie Ky
27786d1d1f event onblur fix 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-17 13:37:21 +01:00
Virginie Ky
84d042736d Code review apply 2020-01-16 18:17:30 +01:00
Virginie Ky
662b9fed0c Error object for custom input 2020-01-16 14:40:37 +01:00
Virginie Ky
d78f7ed220 Apply code PR review 2020-01-15 18:27:05 +01:00
Virginie Ky
469f07b651 PR review apply 2020-01-15 17:27:41 +01:00
Virginie Ky
7f60f6eb57 Apply PR review 2020-01-15 12:17:44 +01:00
Virginie Ky
0bbc414a56 lint fixes 2020-01-13 10:40:10 +01:00