diff options
| author | marijus <mario@mariovavti.com> | 2014-10-13 12:52:41 +0200 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-10-13 12:52:41 +0200 |
| commit | a7aa4efc083f7528436ce5e551c4cf8159aa949b (patch) | |
| tree | 8515cd7a3568011012d9b82e323d612bd48b414d | |
| parent | c41f314302012c023fb3410e6d878eff8bd5b539 (diff) | |
| parent | a512d1a4aab35ac874ccbff89d84fdd6d5b3343f (diff) | |
| download | volse-hubzilla-a7aa4efc083f7528436ce5e551c4cf8159aa949b.tar.gz volse-hubzilla-a7aa4efc083f7528436ce5e551c4cf8159aa949b.tar.bz2 volse-hubzilla-a7aa4efc083f7528436ce5e551c4cf8159aa949b.zip | |
Merge branch 'master' of https://github.com/friendica/red
| -rw-r--r-- | version.inc | 2 | ||||
| -rwxr-xr-x | view/tpl/msg-header.tpl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/version.inc b/version.inc index 5c34749ec..f25d8bb18 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-10-12.826 +2014-10-13.827 diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index b6cff7c74..503e4c8cc 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -49,7 +49,7 @@ else <script> $(document).ready(function() { var uploader = new window.AjaxUpload( - 'prvmail-upload', + 'prvmail-upload-wrapper', { action: 'wall_upload/{{$nickname}}', name: 'userfile', onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, @@ -61,7 +61,7 @@ else ); var file_uploader = new window.AjaxUpload( - 'prvmail-attach', + 'prvmail-attach-wrapper', { action: 'wall_attach/{{$nickname}}', name: 'userfile', onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, |