diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-09 11:38:22 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-09 11:38:22 -0400 |
| commit | 78cd1153f012f871935130325167759898f030ab (patch) | |
| tree | 685a5fe56663e6b6087aa4f28c8f09daf1e80546 /apps/calendar/js/settings.js | |
| parent | b830b3e24b281204344e9162352c7034f0a67187 (diff) | |
| parent | f9cec1426fe639a5683e36b5fbdeb9149feacb19 (diff) | |
| download | nextcloud-server-78cd1153f012f871935130325167759898f030ab.tar.gz nextcloud-server-78cd1153f012f871935130325167759898f030ab.zip | |
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/vcard.php
apps/files_sharing/sharedstorage.php
Diffstat (limited to 'apps/calendar/js/settings.js')
| -rw-r--r-- | apps/calendar/js/settings.js | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/apps/calendar/js/settings.js b/apps/calendar/js/settings.js index 60741f2b6fc..20753a7b8fe 100644 --- a/apps/calendar/js/settings.js +++ b/apps/calendar/js/settings.js @@ -1,11 +1,7 @@ $(document).ready(function(){ $('#timezone').change( function(){ - OC.msg.startSaving('#calendar .msg') - // Serialize the data var post = $( '#timezone' ).serialize(); - $.post( OC.filePath('calendar', 'ajax/settings', 'settimezone.php'), post, function(data){ - //OC.msg.finishedSaving('#calendar .msg', data); - }); + $.post( OC.filePath('calendar', 'ajax/settings', 'settimezone.php'), post, function(data){return;}); return false; }); $('#timezone').chosen(); @@ -52,6 +48,7 @@ $(document).ready(function(){ }); }); calendarcachecheck(); + }); function calendarcachecheck(){ $.getJSON(OC.filePath('calendar', 'ajax/cache', 'status.php'), function(jsondata, status) { |