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 live branch
Merge from branch redmine-2.5-integration
Merge from branch "redmine-2.4-integration"
Merge from branch "live"
Update to Redmine SVN revision 13367 on 2.5-stable branch
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
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
HTML-safe the active colleagues box
Merge from redmine-2.2-integration branch. We're going live!
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 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
Merge from branch live
Pick up activity date from various different methods
Add "mature projects" box. This isn't good enough on its own, it's just a test -- we need this to inform other relationships
Add approximate back-of-envelope calculation of project maturity
Score activity to favour more recent events
Remove nil projects before sorting
Fix to prior commit
html output in parent project link
Ensure generated HTML is marked as safe & thus rendered
fixed a syntax error on an if/else statement.
Merge from live
Update to Redmine SVN revision 11137 on 2.2-stable branch
Avoid crashing out with weird event types that don't give us a proper author record
Merge from branch "browsing"
Refactor into activities helper
Comment only
Merge from branch "bug_521"
Only count downloads from non-bots
Merge from branch "bug_505"
Merge (Bug #505 fix).
Makes explicit that the "user" is a Group.
Merge from the default branch
#501 "new projects" on front page should list hierarchy for non-top-level projects#493 Projects box in front page should label private projects as such
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
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 791:dc15818e132e
Apply same change as in 863f447c4d88 on cannam branch
Layout changes: move h2 into fieldset top line, etc