harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/friendica/red

Browse Source
This commit is contained in:
marijus 2014-10-13 12:52:41 +02:00
commit a7aa4efc08
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
version.inc
View File

@ -1 +1 @@
2014-10-12.826 2014-10-13.827

4
view/tpl/msg-header.tpl
View File

@ -49,7 +49,7 @@ else
<script> <script>
$(document).ready(function() { $(document).ready(function() {
var uploader = new window.AjaxUpload( var uploader = new window.AjaxUpload(
'prvmail-upload', 'prvmail-upload-wrapper',
{ action: 'wall_upload/{{$nickname}}', { action: 'wall_upload/{{$nickname}}',
name: 'userfile', name: 'userfile',
onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
@ -61,7 +61,7 @@ else
); );
var file_uploader = new window.AjaxUpload( var file_uploader = new window.AjaxUpload(
'prvmail-attach', 'prvmail-attach-wrapper',
{ action: 'wall_attach/{{$nickname}}', { action: 'wall_attach/{{$nickname}}',
name: 'userfile', name: 'userfile',
onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },