diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-06 00:15:08 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-06 00:15:08 +0100 |
| commit | 32b29c9d735ae235641a7ea3869c14d7eb69cb4f (patch) | |
| tree | 63e4e269bd33b0688965c9b3b1059466a8f502b8 /settings/js/admin.js | |
| parent | 6de370b64cb8f7fcd9d3bd090b8d801d91d2fcca (diff) | |
| parent | 1785c0c9b9fcdc6e9a8e58f13f45e5b53364882a (diff) | |
| download | nextcloud-server-32b29c9d735ae235641a7ea3869c14d7eb69cb4f.tar.gz nextcloud-server-32b29c9d735ae235641a7ea3869c14d7eb69cb4f.zip | |
Merge branch 'master' into fix-7307
Conflicts:
core/js/router.js
settings/js/admin.js
Diffstat (limited to 'settings/js/admin.js')
| -rw-r--r-- | settings/js/admin.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/settings/js/admin.js b/settings/js/admin.js index cfb1cb788d0..c04c0505deb 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -62,10 +62,18 @@ $(document).ready(function(){ }); $('#mail_settings').change(function(){ - OC.msg.startSaving('#mail_settings .msg'); + OC.msg.startSaving('#mail_settings_msg'); var post = $( "#mail_settings" ).serialize(); $.post(OC.generateUrl('/settings/admin/mailsettings'), post, function(data){ OC.msg.finishedSaving('#mail_settings .msg', data); }); }); + + $('#sendtestemail').click(function(){ + OC.msg.startAction('#sendtestmail_msg', t('settings', 'Sending...')); + var post = $( "#sendtestemail" ).serialize(); + $.post(OC.generateUrl('/settings/admin/mailtest'), post, function(data){ + OC.msg.finishedAction('#sendtestmail_msg', data); + }); + }); }); |