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 from branch cannam
Merge from branch bug_635
Merge from live branch
Fix routes and safe attributes for the external repo settings
Restore our original repos settings page. But I don't think this is going to work well with the new routes configuration
Merge from live.
Layout adjustments
Merge
Restore route for enabling embedded docs through sys controller
Merge from redmine-2.2-integration branch. We're going live!
Add colleagues block to default My page layout
Merge from redmine-2.3 branch to create new branch redmine-2.3-integration
Merge from branch "redmine-2.2"
Update to Redmine SVN revision 11972 on 2.3-stable branch
Update to Redmine SVN revision 11972 on 2.2-stable branch
Merge cannam's latest changes.
Fix project members page: update editlist partial following changes to project member settings partial; update mailer class and templates; make editlist forms not be remote (we just reload page)
Removed tag-realted hacky code from projects controller.
Merge from branch "cannam"
Merge from branch "live"
Fix dodgy merge, syntax, defaults
Logger, reinstate this box as default
Add "People I'm working with" as My Page box -- currently off by default
Merge from branch live
Remove My Projects from projects list (now in My Page)
Merge from branch "feature_550"
Make "my projects" box on My Page look nice when user has no projects (invite them to create one)
Minor adjustments
Syntax fixes
Restore rendering of members list
Removed line from the Projects Controller that was mistakenly left after the merge from the pristine branch.
Merge from live
Update to Redmine SVN revision 11137 on 2.2-stable branch
Add "My Page" box for my projects. Currently this also affects the layout of the non-My-Page version of the My Projects list, need to adjust that
Merge from branch "bug_531"
In repo controller entry action, show the page for the file even if it's binary (so user still has access to history etc links). This makes it possible to use the entry action as the default when a file is clicked on
Merge from live site's latest changes.
Fix bug #370: Use radio buttons instead of a checkbox for project public/private selection
Again avoid bombing out when faced with odd events
Merge from branch "browsing"
Refactor into activities helper
Add busy institutions list
Add browse page stub
Merge from branch "bug_521"
Only count downloads from non-bots
Tally all downloads, not only project/version attachments
Ensure external repo details are passed through WS interface
Merge from the default branch
Merge from default (Redmine 1.3)
Merge from branch "cannam_integration"
Merge from branch "redmine-1.3"
Update to Redmine SVN rev 9414 on 1.3-stable branch
Merge from cannam_integration
Rename .erb to .html.erb in source files as well
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.
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 "bug_352"
fixes bug #352. This fix needs to be reviewd, because it changes directly the redmine core.
Merge from branch "feature_14"
Reverts changes made to Redmine Core's Projects Controller in b2a9e64b8283. Pagination now being done for both normal and filtered projects index.