Mercurial > hg > soundsoftware-site
changeset 271:022181ffa51d live
Merge from branch "feature_88"
| author | Chris Cannam |
|---|---|
| date | Tue, 15 Mar 2011 14:13:00 +0000 |
| parents | 09c503c81902 (diff) 255fcd5f5a4e (current diff) |
| children | 8b569484ba95 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/app/controllers/files_controller.rb Tue Mar 15 14:11:51 2011 +0000 +++ b/app/controllers/files_controller.rb Tue Mar 15 14:13:00 2011 +0000 @@ -8,7 +8,7 @@ include SortHelper def index - sort_init 'filename', 'asc' + sort_init 'active', 'asc' sort_update 'filename' => "#{Attachment.table_name}.filename", 'active' => "#{Attachment.table_name}.active", 'created_on' => "#{Attachment.table_name}.created_on",
--- a/config/locales/en-GB.yml Tue Mar 15 14:11:51 2011 +0000 +++ b/config/locales/en-GB.yml Tue Mar 15 14:13:00 2011 +0000 @@ -899,6 +899,7 @@ text_wiki_page_reassign_children: "Reassign child pages to this parent page" text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?" text_settings_repo_creation: The repository for a project should be set up automatically within a few minutes of the project being created.<br>You should not have to adjust any settings here; please check again in ten minutes. + text_files_active_change: <br>Click the star to switch active status for a download on or off.<br>Active files will be shown more prominently in the download page. default_role_manager: Manager default_role_developer: Developer