# HG changeset patch # User Chris Cannam # Date 1301647093 -3600 # Node ID 3ca3a0255e2a6d69e55f417965fc9d57084a0172 # Parent debf12a566cd242024c18f518d083dd75686b258# Parent 9ccc63655a21c92634cd69af2241ccbb6da7fcf9 Merge from branch "live" diff -r debf12a566cd -r 3ca3a0255e2a app/controllers/files_controller.rb --- a/app/controllers/files_controller.rb Fri Apr 01 09:37:45 2011 +0100 +++ b/app/controllers/files_controller.rb Fri Apr 01 09:38:13 2011 +0100 @@ -8,7 +8,7 @@ include SortHelper def index - sort_init 'active', 'asc' + sort_init 'active', 'desc' sort_update 'filename' => "#{Attachment.table_name}.filename", 'active' => "#{Attachment.table_name}.active", 'created_on' => "#{Attachment.table_name}.created_on", diff -r debf12a566cd -r 3ca3a0255e2a extra/soundsoftware/reposman-soundsoftware.rb --- a/extra/soundsoftware/reposman-soundsoftware.rb Fri Apr 01 09:37:45 2011 +0100 +++ b/extra/soundsoftware/reposman-soundsoftware.rb Fri Apr 01 09:38:13 2011 +0100 @@ -346,14 +346,5 @@ log("\trepository #{repos_path} created"); end - if project.respond_to?(:repository) and project.repository.is_external? - external_url = project.repository.external_url; - log("\tproject #{project.identifier} has external repository url #{external_url}"); - if !external_url.match(/^https?:/) - # wot about git, svn/svn+ssh, etc? should we just check for a scheme at all? - log("\tthis is not an http(s) url: ignoring"); - end - end - end