yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-04 03:43:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,194 Commits 123 Branches 507 Tags
Commit Graph

822 Commits

Author SHA1 Message Date
Abdón Rodríguez Davila
54c383fd44
Merge branch 'master' into eslint-update 2019-09-12 15:05:53 +02:00
soupette
535467be3c Fix PR feedback 2019-09-10 17:51:26 +02:00
soupette
93941e3d11 Delete useless container 2019-09-10 17:32:46 +02:00
soupette
61a22c3a9b Fixes #3677 2019-09-10 12:33:21 +02:00
soupette
869cde8f19 Fix rerender issue in the admin 2019-09-10 12:14:07 +02:00
soupette
1e26065d95 Clean code and fix tests 2019-09-10 10:37:02 +02:00
soupette
b7b8e368a2 Fixes #3942 2019-09-10 09:06:26 +02:00
soupette
b3bc4a0941 Remove willSecure and didGetSecured data hooks 2019-09-09 18:44:41 +02:00
soupette
8485657342 Move global data to the app container and update plugins 2019-09-09 17:12:01 +02:00
soupette
22bf28431f Use global props instead of admin s ones 2019-09-09 16:45:25 +02:00
soupette
e1b0f07655 Global single request 2019-09-09 16:06:54 +02:00
soupette
6e559170f7 Update tests 2019-09-09 15:27:54 +02:00
Abdón Rodríguez Davila
187a669d1e Merge branch 'master' into eslint-update 
# Conflicts:
#	.eslintrc.js
#	package.json
#	packages/strapi-admin/admin/src/containers/HomePage/CommunityContent.js
#	packages/strapi-admin/admin/src/containers/HomePage/WelcomeContent.js
#	packages/strapi-helper-plugin/lib/src/components/InputTextWithErrors/index.js
#	packages/strapi-hook-bookshelf/lib/index.js
#	packages/strapi-hook-bookshelf/lib/utils/graphql.js
#	packages/strapi-hook-bookshelf/lib/utils/index.js
#	packages/strapi-plugin-content-manager/admin/src/components/FilterOptions/InputWithAutoFocus.js
#	packages/strapi-plugin-content-manager/admin/src/components/SelectMany/index.js
#	packages/strapi-plugin-content-manager/admin/src/components/SelectOne/index.js
#	packages/strapi-plugin-content-manager/admin/src/components/TableHeader/index.js
#	packages/strapi-plugin-content-manager/admin/src/containers/ListPage/index.js
#	packages/strapi-plugin-content-manager/admin/src/containers/SettingPage/index.js
#	packages/strapi-plugin-content-manager/config/policies/routing.js
#	packages/strapi-plugin-content-manager/services/ContentManager.js
#	packages/strapi-plugin-content-type-builder/admin/src/components/TableListRow/index.js
#	packages/strapi-plugin-content-type-builder/admin/src/containers/AttributesPickerModal/index.js
#	packages/strapi-utils/lib/models.js
#	yarn.lock
 2019-09-09 15:26:35 +02:00
soupette
99cb1f8f5e Add all views 2019-09-09 14:32:06 +02:00
soupette
1cd7084a94 Move auth views to the admin 2019-09-09 13:58:07 +02:00
soupette
fbf301c5f6 Fix design 2019-09-06 16:58:44 +02:00
soupette
41c42bde49 Refactoo forms, created form utils 2019-09-06 16:22:04 +02:00
soupette
23420ffe88 Created PageTitle components 2019-09-05 17:13:17 +02:00
soupette
fb3e266d16 Move auth trads to the admin 2019-09-05 16:41:23 +02:00
soupette
e59527cc1d Init Auth in admin package 2019-09-05 16:27:30 +02:00
soupette
49faee06c2 Migrate Logout compo to functionnal component, remove scss 2019-09-05 14:29:55 +02:00
Virginie Ky
1e450da9cc gst 2019-09-04 12:51:27 +02:00
Virginie Ky
a3e044da87 leftmenu responsive ui 2019-09-03 12:29:12 +02:00
Virginie Ky
cb35d6e80a homepage social icon ratio fix 2019-08-28 16:16:15 +02:00
Abdón Rodríguez Davila
21a14ee737 Remove definitions for rules were not found 2019-08-28 12:20:27 +02:00
Virginie Ky
9cba18e6dc Groups qa fixes 2019-08-27 15:38:53 +02:00
soupette
69488c5d98 Fix left menu link active and dnd bug when draging with the img tag 2019-08-26 16:36:58 +02:00
Virginie Ky
56b93581d8 Some UI fixes 2019-08-26 13:44:04 +02:00
Virginie Ky
124b27d58f Admin HomePage UI 2019-08-23 18:17:34 +02:00
soupette
c1a5311e94 Fix min schema ctm 2019-08-23 16:11:23 +02:00
soupette
a0215fbf58 Fixes #3813 2019-08-23 11:11:40 +02:00
Alexandre BODIN
ad1cee6469
Merge branch 'master' into develop 2019-08-22 16:06:05 +02:00
Alexandre BODIN
788b3ff7e7
Merge branch 'master' into master 2019-08-22 16:05:38 +02:00
soupette
14157f73b9 Update trads and add links to terms and privacy policy 2019-08-21 10:06:09 +02:00
soupette
93a3e0a1e2 Remove google analytics 2019-08-21 09:32:19 +02:00
soupette
eef4939415 Update homepage design 2019-08-21 09:28:30 +02:00
Vladislav Umrikhin
e146d2dee1 Update RU translation in admin 2019-08-19 03:48:12 +10:00
soupette
d7404346d5 Add tests to setting model view 2019-08-13 19:19:13 +02:00
cyril lopez
435b3a9d24
Merge branch 'develop' into front/upgrade-react 2019-08-13 17:10:36 +02:00
soupette
857ec1ca70 Rename lifecycle hooks 2019-08-13 11:31:10 +02:00
Alexandre Bodin
6e48232c85 Merge branch 'master' into develop 2019-08-13 10:55:37 +02:00
chisus
2588c22dd5 Update KO translation 2019-08-12 11:22:56 +09:00
Vladimir Babin
2aa4f71b00 Update RU translation in admin 2019-08-12 00:48:24 +05:00
soupette
25d7fad468 Add option to change the logo of the login page 2019-08-09 17:21:39 +02:00
Alexandre Bodin
7520961d27 Merge branch 'master' into develop 2019-08-06 13:49:10 +02:00
David Kartuzinski
3028bc88d7
Change Reddit to Strapi Group on Reddit 2019-08-05 16:55:50 +02:00
soupette
0a3b692a87 Fixes #2866 2019-07-31 15:22:37 +02:00
soupette
87ddd2980b Merge branch 'develop' of github.com:strapi/strapi into ctm/repeatable-edit-view 2019-07-30 16:18:31 +02:00
soupette
53d0014dc2 Clean code 2019-07-29 18:02:45 +02:00
soupette
fdd0b0f63d Fix UI 2019-07-29 17:11:53 +02:00