yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-10 17:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,761 Commits 115 Branches 488 Tags
Commit Graph

942 Commits

Author SHA1 Message Date
Jim LAURIE
740471024c
Merge branch 'master' into patch-2 2018-06-06 21:02:20 +02:00
Jim Laurie
2a449532ec 3.0.0-alpha.12.3 2018-06-06 17:34:07 +02:00
soupette
8302d32d71 Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-06-05 12:06:17 +02:00
Cyril lopez
cb895ab586 Fix PR feedback 2018-06-04 17:46:08 +02:00
Jim Laurie
c9b4e29c65 Merge branch 'test-suits' of github.com:strapi/strapi into test-suits 2018-06-04 14:43:09 +02:00
Jim Laurie
ec5ef9a240 Fix PR feedback 2018-06-04 14:39:26 +02:00
Jim LAURIE
3d3d75b135
Merge branch 'master' into test-suits 2018-06-03 20:59:57 +02:00
Evan Owens
321d9ae47c
Left-align form labels in Edge 2018-06-01 21:21:11 -04:00
Austin Bratcher
ddc01eb27b Update to add dynamic settings to email plugin 
Email plugin now functions more like the upload plugin. Users can go to the plugins page, click on the settings cog for the email, and switch between providers or change settings. The default provider is strapi-email-sendmail. Extra providers can be added by installing strapi-email-mailgun or strapi-email-sendgrid.
 2018-05-31 14:29:00 -05:00
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
Aurelsicoko
4ca24a37de Add usage tracking link in the menu #1280 2018-05-28 14:39:02 +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
74d3987a11
Merge branch 'master' into add-styled-component 2018-05-18 11:07:32 +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
Jim Laurie
31c0d7457a 3.0.0-alpha.12.2 2018-05-17 16:54:27 +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
4069a3bdaf Fix fail build on publish npm release 2018-05-16 15:22:20 +02:00
Jim Laurie
4fe7b6176e Fix conflicts & lint 2018-05-16 12:07:02 +02:00
Jim LAURIE
1465a9b0d6
Merge branch 'master' into improve-language-selector 2018-05-16 10:48:01 +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
Evan Owens
4086506acf
Fix spelling 2018-05-15 16:08:47 -04:00
soupette
17d04592b3 Fixes #1166 2018-05-15 14:47:19 +02:00
soupette
51f5adc56a Add styled-components 2018-05-15 14:07:18 +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
cyril lopez
1f019c60c3
Merge branch 'master' into eslint 2018-05-14 11:50:32 +02:00
Jim LAURIE
0bb4f9cfae
Merge branch 'master' into npmignore 2018-05-08 11:36:35 +02:00