gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix conflicts

Browse source
This commit is contained in:
Stella Rouzi 2014-08-12 15:48:29 +03:00
parent e2fb434dc7
commit 71dfb3b7e4
34 changed files with 160 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/proposal/_form.html.haml
View file

@ -71,7 +71,7 @@
data.formData = inputs.serializeArray();
});
$.getJSON($('#fileupload').prop('action'), function (files) {
var fu = $('#fileupload').data('blueimpFileupload'),
var fu = $('#fileupload').data('fileupload'),
template;
fu._adjustMaxNumberOfFiles(-files.length);
template = fu._renderDownload(files)

2
app/views/proposal/new.html.haml
View file

@ -1,6 +1,6 @@
.row
.col-md-12
= simple_format(@conference.call_for_papers.description) if @conference.call_for_papers
= simple_format(@conference.call_for_papers.description)
.row
.col-md-12
= render 'proposal_form'