To check out this repository please hg clone the following URL, or open the URL using EasyMercurial or your preferred Mercurial client.
hg clone
Fix some merge/runtime problems
Merge from branch "redmine-2.4-integration"
Merge from branch "live"
Merge from branch redmine-2.4
Update to Redmine SVN revision 13367 on 2.5-stable branch
Update to Redmine SVN revision 13356 on 2.4-stable branch
Fix #832 main page of a project should not have "Overview" as the first word of the html title
Fix deprecation warning about passing a template handler in the template name
Layout fix
Merge from branch cannam
Fixes to the prior commit
Go for unique managers only, not all members unique
Whoops, call the right method why not
Add varied-mature-projects Featured box
Avoid showing institution "none" as busy
Merge from redmine-2.4 branch
Update to Redmine SVN revision 12979 on 2.4-stable branch
Merge from default branch
Merge from live branch
Fix stray merge markers
Merge from live branch. Still need to merge manually in files overridden by plugins.
Update to Redmine 2.4 branch rev 12663
Merge
Merge fix from luisf branch
Merge from branch "bug_794"
Makes the default radio button checked by default -- this should fix bug #794.
Merge from branch bug_635
Merge from branch luisf
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
Removes duplicate code introduced when integrating with redmine-2.2
Merge from live.
Merge from branch "luisf"
expires_in doesn't do what I thought here, we have external expiry job instead
I think we have room for 7 projects here, rather than 5
Layout adjustments
Restore news to home page, tweak formatting
Using correct arguments on form builder helper.
Restore route for enabling embedded docs through sys controller
HTML-safe the active colleagues box
Merge from redmine-2.2-integration branch. We're going live!
Temporarily remove "Mature projects", it doesn't work well enough. Add Search Projects link
More front page formatting
Prepare simplification of front page
Add colleagues block to default My page layout
Add "all projects" link to explore page
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)
edit renamed to update in controller
Mark intro text html safe
Removed tag-realted hacky code from projects controller.
fixed the project _overview form_for (had one extra parameter); created route for a project's settings.
Added a few more css classes to the rest of the new Project view.
html_safe'd identifier; added info class.
Fixed project_is_public_1 label.
Converting fields_for ... :builder => TabularFormBuilder to labelled_fields_for seems like the thing to do
We have a MyHelper now, so we need a MyHelperPatch (also some other minor fixes)
Some fixes from comparing plugin views to core app views
Merge from branch "cannam"
Show maximum of 10 colleagues
Fix dodgy merge, syntax, defaults
Various fixes to colleagues box
Logger, reinstate this box as default
Some layout and fixes
Add "People I'm working with" as My Page box -- currently off by default
Fix failure to truncate long descriptions without carriage returns in them correctly
Three-column explore layout
Merge from branch live
Add overlooked file
Pick up activity date from various different methods
Small wording and layout fix
Fix internal error on homepage!