yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-12 16:43:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,041 Commits 107 Branches 503 Tags
Commit Graph

441 Commits

Author SHA1 Message Date
Salem
e6b812a357
Update languages.json 2018-05-31 01:03:12 +03:00
Salem
3075a9a70b
Create ar.json 2018-05-31 01:02:39 +03:00
soupette
e0376cdd28 Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-05-29 11:46:56 +02:00
Jim LAURIE
d85ecc707f
Merge branch 'master' into patch-ui-admin 2018-05-28 15:45:00 +02:00
soupette
985739c660 Update build 2018-05-28 15:22:02 +02:00
soupette
22bf58485e Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-05-28 14:59:32 +02:00
Johann Pinson
4e8e495275 fix(admin): adjust modal size + position #1062 2018-05-24 18:29:19 +02:00
Jim Laurie
b8b1afa103 Use request to send form 
axios not support FormData request from nodejs script
 2018-05-24 15:12:15 +02:00
soupette
d1dfb7fc40 Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-05-22 18:17:56 +02:00
Raul Riera
262182fd00 Fix a typo in the error key 2018-05-21 14:14:09 -04:00
soupette
569717e69f Move logic to container 2018-05-18 16:46:13 +02:00
soupette
f3bdbff968 Fix conflicts 2018-05-18 14:56:40 +02:00
ertugrulungor
8a327c4cb6 Turkish translations 2018-05-18 15:41:18 +03:00
Jim Laurie
6c194ff333 Init create new app test 2018-05-18 14:22:24 +02:00
Jim LAURIE
40cfa26c74
Merge branch 'master' into fix-auth-redirect 2018-05-18 10:57:40 +02:00
Johan Baath
7e6f7dcbf4 remove whitespace 2018-05-17 19:06:52 +02:00
Johan Baath
bf0ac64b9c wait for the user plugin to load before redirection 2018-05-17 16:11:13 +02:00
soupette
1c2ab4420b Remove useless components in both admin and ctm 2018-05-17 15:56:20 +02:00
soupette
d0e27e95a4 Created SlideDown components in helper plugin 
Move LoadingIndicator into the helper.
Start to use react-loadable in the content manager
 2018-05-17 15:38:06 +02:00
Aurelsicoko
d816e5b313 Hide divider on hover 2018-05-17 15:05:53 +02:00
Aurelsicoko
9c8d87a8fd Remove log 2018-05-17 13:52:09 +02:00
Aurelsicoko
818bbe8b78 Fix submit button newsletter 2018-05-17 13:39:42 +02:00
Aurelsicoko
4831610188 Fix toggle lang register page 2018-05-17 13:37:39 +02:00
Jim Laurie
4fe7b6176e Fix conflicts & lint 2018-05-16 12:07:02 +02:00
soupette
ea6266eb48 Fix name 2018-05-16 09:18:30 +02:00
soupette
f68315ec3e Fix import 2018-05-16 09:14:18 +02:00
soupette
17d04592b3 Fixes #1166 2018-05-15 14:47:19 +02:00
soupette
ce6b56638e Fix feedback design 2018-05-15 12:38:27 +02:00
soupette
9d9ca631e1 Add separator between logout and language selector 2018-05-15 12:14:30 +02:00
soupette
a1e69197a3 Change LocaleToggle css 2018-05-14 18:22:37 +02:00
soupette
4563aae50a Change locale error to locale warning 2018-05-14 16:11:58 +02:00
soupette
872393eab5 Fix login bug when registering the first admin user 2018-05-14 15:43:27 +02:00
Jim LAURIE
c09f5138a2
Merge branch 'master' into eslint 2018-05-07 16:03:35 +02:00
soupette
e9f68a3bc9 Lint in strapi-bookshelf 2018-05-04 17:29:44 +02:00
soupette
f9f78745ca Change test logic 2018-05-04 15:38:42 +02:00
soupette
74de4da177 Change test 2018-05-04 11:55:34 +02:00
soupette
2a30a20e7e Important! fix monorepo setup build command 2018-05-03 17:39:24 +02:00
Jim Laurie
c491c61a97 3.0.0-alpha.12.2 2018-05-03 14:15:21 +02:00
soupette
30528f40ec Add eslint to strapi-admin backend 2018-05-02 11:01:27 +02:00
Zhuang
7634ff5602 add simplify chineses translation for plugins 2018-04-30 22:09:53 +08:00
Zhuang
97531cc3d2 Merge branch 'master' of https://github.com/strapi/strapi into add_simply_chinese_translation 2018-04-30 16:56:19 +08:00
Jim LAURIE
1850d5539b
Merge branch 'master' into improve-webpack-config 2018-04-26 14:20:10 +02:00
soupette
d2b6667666 Fix menu footer css 2018-04-26 11:27:37 +02:00
soupette
42c64091e2 Fixes 770 2018-04-26 11:24:47 +02:00
soupette
b7fffb0ce7 Fixes #958 2018-04-25 16:34:20 +02:00
Herbert Lin
a717faa817 Merge branch 'master' of https://github.com/XcrossD/strapi 2018-04-24 18:00:52 +08:00
Herbert Lin
0db8f05e8b Temp fix for LeftMenuFooter style. 2018-04-24 17:59:30 +08:00
Jim LAURIE
f2cb6d7af8
Merge branch 'master' into master 2018-04-24 11:29:39 +02:00
Jim LAURIE
36393b9594
Merge branch 'master' into reduce-setup-monorepo 2018-04-23 12:32:01 +02:00
XcrossD
43357bf49b
Update LeftMenuFooter style 2018-04-23 11:20:14 +08:00