To check out this repository please hg clone the following URL, or open the URL using EasyMercurial or your preferred Mercurial client.
hg clone
Merge
Further adjustments to Documents, Files, Publications texts to clarify the difference between them
Merge from branch "cannam"
Clarify some new-project descriptive texts
Merge from branch "live"
Merge from branch "feature_318"
Finish adding download link
Clarify pending-approval message
Merge from branch "feature_36"
Merge from branch "cannam_integration"
Restore Tip of the Day settings entry lost during merge of rev cd2282d2aa55
Change "View all issues" to "View all watched issues" for watched issues box in My Page
Introduce a new latest_downloads plugin to manage active and shortcut for attachments.Add a table for attachment active/shortcut data.Move existing active-handler code into the new plugin (but still using the "old" active column in the attachments table). Note the files_controller stuff doesn't actually work here.
Merge from bug_255
Some text changes to fix #255
Merge from branch "luisf"
OK, it appears that we do need en-GB.yml to exist -- but it can be empty
Merge from branch "redmine-1.2"
Update to Redmine 1.2.1 on 1.2-stable branch (Redmine SVN rev 6270)
Remove en-GB.yml. Since feature #117, we have been using only en.yml and en-GB should not exist in the directory tree.
Add two translation strings that were only in en-GB previously
Merge from branch "feature_142"
Show styled member list in Members view for non-manager users; implement member editing partial in this view for manager users. Remove Members tab from Settings
If a search matches any project titles (and projects are in scope for the search), show those projects separately at the start of the search results provided there are no more than 5 of them (further fix to bug #94)
Add "Edit this page" link to welcome page if the current user is authorised to do so
Merge from branch "cannam-pre-20110113-merge"
Update to Redmine 1.2-stable branch (Redmine SVN rev 6000)
Refer to MATLAB docs as well as C++/Java
Merge from branch "feature_135"
Make the text slightly stronger still!
Make the Research Description description more descriptive (see #135)
Merge from branch "feature_126"
Turn general News box on site front page into a Site News box (#126)
Merge from branch "bug_127"
Formatting for Latest News box -- make it much more like the Recent Activity layout. Also adjust the date formatting in Latest Projects likewise.
Minor editorial changes
Merge from branch "feature_123"
Text and layout changes to try to clarify the Welcome page settings
Add the overview setting to the project settings. Still rather clumsy, but it does appear to work!
Merge from branch "feature_122"
Add Recent Activity partial, include it as a block in My Page (on by default) and in the project information page
Merge from branch "bug_70"
Show checkout permissions message only when user logged in; some tidying and layout
Merge from branch "feature_117"
Merge from branch "bug_97"
Merge from branch "feature_115"
Merge from branch "feature_73"
Produce a single en.yml which contains British texts but describes itself as just English.The difference between en and en-GB is minimal for this application, apart from date formats, and the pain in maintaining both is significant. See #117 and #58.
Add a note explaining that the repo is external (if relevant) and giving its URL (do we want this?)
Do not show external checkbox/field until the repo has been automatically populatedPull external Hg as well as git and svn reposSome textual changes
merge from branch bug_97
fixed template variable problems; created subject label; fixed old labels
new format for label variables.
DEV commit: created template; need to solve bug in template variables.
Textual changes
Merge from branch "bug_95"
merge from branch bug_95
merge from feature_72
added the description; changed the roles labels. minor fixes to layout.
Merge from branch "feature_72"
the status messages now depend on the repository type.
Merge from branch "feature_80"