yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-28 00:22:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,053 Commits 119 Branches 506 Tags
Commit Graph

3850 Commits

Author SHA1 Message Date
Alexandre Bodin
63f592a586 Use bcrypt without needing users-permissions and make password update safer 2021-10-18 12:38:36 +02:00
ronronscelestes
7ed9e2ebb2 fixed drag function, fixed tests, added ellipsis utils function 2021-10-18 12:31:23 +02:00
ronronscelestes
6debe34f90 Merge branch 'cm-configure-view-lv' of https://github.com/strapi/strapi into cm-settings/drag-and-drop 2021-10-18 12:02:36 +02:00
ronronscelestes
f240f5f6be fixed action layout conditions in CM LV 2021-10-15 17:05:22 +02:00
ronronscelestes
50a7bbab75 fix merge conflicts + updated labelField in preview card 2021-10-15 16:47:15 +02:00
ronronscelestes
81d90eb57c card preview and drag layer update 2021-10-15 16:31:59 +02:00
ronronscelestes
13b0cdc66e feedback fixes 2021-10-15 15:23:19 +02:00
ronronscelestes
8eb0fcc8fb dnd draggable card 2021-10-15 14:22:08 +02:00
soupette
33b08045c7 Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-15 08:41:56 +02:00
soupette
30ac998cb7 Remove header_icon from search 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-14 15:47:09 +02:00
ronronscelestes
ba9eb03f70 added edit tests + fixed reduce test 2021-10-14 15:40:11 +02:00
ronronscelestes
fff532db70 cleaning up - getTrad, functions handle naming, edit modal header title, removed lodash get 2021-10-14 14:53:06 +02:00
ronronscelestes
563adf281d fix merge conflicts 2021-10-14 12:14:36 +02:00
ronronscelestes
46e01ea7d6
Migration/ Configure LV add+remove field (#11247) 
* add and delete view field

* removed submit succeded reducer test

* added test

* test add field + feedback fixes

* replaced select add field by simple menu + updated test

* made View its own component

* UI badges feedback fix

* feedback fixes
 2021-10-14 11:47:08 +02:00
ronronscelestes
9d9631860a label or name on draggablecard 2021-10-14 10:36:05 +02:00
ronronscelestes
e171f52e63 edit field modal 2021-10-13 17:45:11 +02:00
ronronscelestes
67ce74bcda UI badges feedback fix 2021-10-13 14:58:57 +02:00
ronronscelestes
ef37ff5747 made View its own component 2021-10-13 14:49:32 +02:00
Alexandre Bodin
f885caf388 Merge branch 'releases/v4' into v4/query-params 2021-10-13 14:11:00 +02:00
ronronscelestes
68da64317c replaced select add field by simple menu + updated test 2021-10-13 14:02:18 +02:00
ronronscelestes
fd773bafe0 Merge branch 'cm-configure-view-lv' of https://github.com/strapi/strapi into cm-settings/view-delete 2021-10-13 12:43:58 +02:00
ronronscelestes
edc50b29db Merge branch 'releases/v4' of https://github.com/strapi/strapi into cm-configure-view-lv 2021-10-13 12:42:14 +02:00
ronronscelestes
a595e68d93 test add field + feedback fixes 2021-10-13 12:34:10 +02:00
ronronscelestes
c83c44d21c added test 2021-10-12 16:54:38 +02:00
ronronscelestes
1cd66105a9 removed submit succeded reducer test 2021-10-12 14:53:48 +02:00
ronronscelestes
c1b61fa2a7 merge commit 2021-10-12 14:52:20 +02:00
Marvin Frachet
055fe3a3f1
Bump parts to alpha 46 (#11245) 2021-10-12 14:49:41 +02:00
ronronscelestes
2cb688e871 plugins query params test 2021-10-12 12:06:21 +02:00
ronronscelestes
e16207715b feedback fixes - plugins query params 2021-10-12 11:47:47 +02:00
ronronscelestes
4d552a7980 add and delete view field 2021-10-12 10:55:54 +02:00
Alexandre Bodin
435ce3bc88 Move _locale to locale 2021-10-11 21:22:16 +02:00
Alexandre Bodin
edbad96c2c Remove old query params and remove _where occurences 2021-10-11 21:05:23 +02:00
ronronscelestes
dfe8b64ebf updated test 2021-10-11 16:21:45 +02:00
ronronscelestes
5055b6354b PR review 2021-10-11 16:09:53 +02:00
ronronscelestes
6a0328e840 feedback fixes 2021-10-11 14:47:13 +02:00
Alexandre BODIN
f2b0aa6301
Merge pull request #11232 from strapi/v4/auth-scopes-array 
Use array checks in api-token aut strategy
 2021-10-11 13:56:42 +02:00
Alexandre Bodin
cc52a93a47 Use array checks in api-token aut strategy 2021-10-11 12:29:38 +02:00
ronronscelestes
1b28d7b80a small fix-clean 2021-10-11 11:21:14 +02:00
ronronscelestes
0b6329369e removed msw server put 2021-10-11 10:54:45 +02:00
ronronscelestes
f7914304be settings form + react query + snapshot 2021-10-11 10:43:31 +02:00
soupette
0309c74b6c Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-11 09:44:31 +02:00
soupette
7485e1d91e Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-11 09:41:55 +02:00
Marvin Frachet
4699dc8b6e
Bump parts to alpha 45 (#11221) 2021-10-11 09:11:57 +02:00
soupette
7666e7c77f Migrate some of the advanced and the base form 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-08 16:07:52 +02:00
soupette
f34c0cf3bf Update ctb layout 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-08 11:13:31 +02:00
soupette
211da15d43 Add attributes option modal 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-07 15:38:28 +02:00
Alexandre Bodin
c1c6dd4c11 Harmonize registries and simplify listing commands 2021-10-07 13:06:40 +02:00
soupette
e2fdcee602 Merge branch 'releases/v4' of github.com:strapi/strapi into v4/ctb 2021-10-07 09:48:09 +02:00
soupette
0b4519e082 Move GenericInput into helper-plugin 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-07 09:44:56 +02:00
soupette
e7bba66adf Merge branch 'releases/v4' of github.com:strapi/strapi into v4/ctb 2021-10-06 13:57:25 +02:00