yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-01 05:17:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,041 Commits 106 Branches 487 Tags
Commit Graph

441 Commits

Author SHA1 Message Date
Jim LAURIE
a6d48caad9 3.0.0-alpha.12.7 2018-07-10 15:37:47 +02:00
Jim LAURIE
a048e29bb0
Merge branch 'master' into yarn-install 2018-07-10 11:14:44 +02:00
Taihoon Kim
414453e02e fixed typos in Korean language 2018-07-10 14:13:13 +09:00
Jim LAURIE
09e8892190
Merge branch 'master' into yarn-install 2018-07-08 10:57:51 +02:00
kishu
dea62861f0 update language list in admin panel to be scrollable 
Squashed commits:
[91c28113b] update language list in admin panel to be scrollable
 2018-07-08 15:31:45 +09:00
kishu
5edf9111cf fixed typos 2018-07-08 15:12:00 +09:00
Taihoon Kim
5cfb9e9439 Korean Language Support 2018-07-06 15:34:20 +09:00
Hector Grecco
5182243268
Update pt-BR.json 2018-07-04 16:45:16 -03:00
Jim LAURIE
74adea6a40
Merge branch 'master' into yarn-install 2018-07-03 17:10:00 +02:00
Carlos Guimaraes
e3f745e53c
Brazilian Portuguese Language Support 2018-07-01 17:20:17 -03:00
Carlos Guimaraes
4fe5721ed8
Brazilian Portuguese Language Support 2018-07-01 17:15:34 -03:00
Carlos Guimaraes
6b5f0f3b7a
Brazilian Portuguese Language Support 2018-07-01 16:50:54 -03:00
Faustino Kialungila
c8a74b9e69 Portuguese Language Support 2018-06-23 12:11:20 +02:00
cyril lopez
f056c44dd6 Fix conflicts 2018-06-22 14:17:32 +02:00
soupette
e1790c31ef Manage to install strapi with yarn 2018-06-21 15:07:50 +02:00
cyril lopez
6f156144b5
Merge branch 'master' into add-loader 2018-06-20 15:15:34 +02:00
Jim LAURIE
c93fef17dc
Merge branch 'master' into input-json 2018-06-20 12:28:59 +02:00
Jim LAURIE
9be5655d00 Fix PR feedback 2018-06-20 12:19:58 +02:00
Alessio Koci
a91a0752cb Language IT - Strapi Admin 2018-06-19 14:17:22 +02:00
Alessio Koci
7d99e0c73b ITA config admin language 2018-06-19 14:16:53 +02:00
soupette
372842ef5c Merge branch 'master' of github.com:strapi/strapi into add-loader 2018-06-18 11:11:38 +02:00
soupette
e4ed3b4d11 Merge master 2018-06-18 10:16:32 +02:00
Salem
6c6dcc94c1
Update index.js 2018-06-17 16:10:46 +03:00
Jim LAURIE
e8d435989c
Merge branch 'master' into master 2018-06-17 14:16:33 +02:00
soupette
7ffb90621a Handle JSON errors 2018-06-15 16:48:29 +02:00
Jim LAURIE
cf88b902dd
Merge branch 'master' into master 2018-06-14 22:36:44 +02:00
Dominik Opyd
522280c3ec polish language | strapi-admin 2018-06-14 18:52:10 +02:00
soupette
cf6a2bdd25 merge 2018-06-14 16:49:39 +02:00
soupette
4346b761a9 Add loader to mkt and plugin page 2018-06-14 16:17:44 +02:00
Dominik Opyd
7186cd6e49 polish language | upgrade 2018-06-14 15:59:24 +02:00
soupette
d3914fdf84 Global loader editpage when editing 2018-06-14 15:30:54 +02:00
soupette
dee1ecd23f Change users-permissions hp reducer 2018-06-14 11:35:40 +02:00
soupette
f52880e810 Init loader plugin users 2018-06-13 22:12:11 +02:00
Jim LAURIE
e0537e1eb6
Merge branch 'master' into master 2018-06-13 21:36:54 +02:00
soupette
d9be6cb831 Add loaders to SocialLink HP 2018-06-13 18:38:45 +02:00
soupette
f47aed1d3e Add loaders to hp 2018-06-13 18:27:03 +02:00
soupette
5cae072b19 Add loaders to ctm listpage 2018-06-13 16:17:19 +02:00
soupette
84871a0fd5 Add full page loader 2018-06-13 10:39:50 +02:00
Jim LAURIE
ee772c013e
Merge branch 'master' into master 2018-06-09 13:50:22 +02:00
Zhuang
66f273d673 fix language loading, first try load user language config, and then try load short user language code 2018-06-09 19:20:25 +08:00
Jim LAURIE
fd69eff50c
Merge branch 'master' into change-stm-link 2018-06-08 20:20:41 +02:00
soupette
228e04c44e Move settings-manager to configs 2018-06-07 11:32:43 +02:00
Jim LAURIE
740471024c
Merge branch 'master' into patch-2 2018-06-06 21:02:20 +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