Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
This commit is contained in:
commit
29c49fbb0c
|
@ -126,4 +126,4 @@
|
|||
<%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments} %>
|
||||
</div>
|
||||
</div>
|
||||
<% html_title(l(:label_attachment_plural)) -%>
|
||||
<%# html_title(l(:label_attachment_plural)) -%>
|
|
@ -95,4 +95,4 @@
|
|||
<%= render :partial => 'project_list',:locals => {project: @project, all_attachments: @all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments} %>
|
||||
</div>
|
||||
</div>
|
||||
<% html_title(l(:label_attachment_plural)) -%>
|
||||
<%# html_title(l(:label_attachment_plural)) -%>
|
|
@ -74,7 +74,7 @@
|
|||
</div><!---re_con end-->
|
||||
|
||||
</div>
|
||||
<% html_title(l(:label_attachment_plural)) -%>
|
||||
<%# html_title(l(:label_attachment_plural)) -%>
|
||||
<script>
|
||||
function org_upload_files(org_subfield_id){
|
||||
$.ajax({
|
||||
|
|
Loading…
Reference in New Issue