To check out this repository please hg clone the following URL, or open the URL using EasyMercurial or your preferred Mercurial client.
hg clone
Refactor into activities helper
Add busy institutions list
Busy-projects partial, etc
Merge from the default branch
Merge from cannam_integration
Rename .erb to .html.erb in line with the convention
needs further testing Moved several files' extension to ".erb"; modified two files because they were calling partials/templates with rhtml extensions; renamed email templates sent when a user is added to a publication.
Merge from branch "redmine-1.3"
Remove .svn directories from subdirectories in preparation for merging from newer svn repo format
Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)
Merge from branch "luisf"
Merge from branch "cannam"
Merge
Merge from branch "redmine-1.2"
Update to Redmine 1.2.1 on 1.2-stable branch (Redmine SVN rev 6270)
Merge from branch "cannam-pre-20110113-merge"
Update to Redmine 1.2-stable branch (Redmine SVN rev 6000)
Merge from branch "cannam-pre-20110113-merge" (includes merge from feature_121)
Merge from branch "feature_121"
Ensure Recent Activity shows only activity on projects the user is actually a member of, if invoked from My Page (rather than on all permitted projects)
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.
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
Fix up entries, etc, from a current SVN checkout (for the same revision as previously)
Update to Redmine trunk rev 4802
Update to Redmine trunk rev 4732
Merge from the default branch. Note that this is not a valid SVN repository any more (use default, redmine-1.1 etc for SVN updates).
Merge from branch "redmine-1.1"
merged with new version from trunk