Mercurial > hg > soundsoftware-site
changeset 315:fd027311814a cannam-pre-20110113-merge
Merge from branch "live"
| author | Chris Cannam |
|---|---|
| date | Mon, 28 Mar 2011 18:05:43 +0100 |
| parents | 766ad4e52e6e (current diff) c80103b81194 (diff) |
| children | cf680b826117 |
| files | |
| diffstat | 2 files changed, 1 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/app/controllers/files_controller.rb Mon Mar 28 17:41:23 2011 +0100 +++ b/app/controllers/files_controller.rb Mon Mar 28 18:05:43 2011 +0100 @@ -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.yml Mon Mar 28 17:41:23 2011 +0100 +++ b/config/locales/en.yml Mon Mar 28 18:05:43 2011 +0100 @@ -978,11 +978,6 @@ label_set_role_plural: Choose roles for new member - label_manager_description: All powers including adding and removing members and adjusting project settings - label_developer_description: Can commit to repository and carry out most project editing tasks - label_reporter_description: Can submit bug reports; has read access for private projects - - label_set_role_plural: Choose roles for new member notice_added_to_project: 'You have been added to the project "{{project_name}}".' notice_project_homepage: "You can visit the project using the following link: {{project_url}}" mail_subject_added_to_project: "You've been added to a project on {{value}}"