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
Merge from branch "live"
Merge from branch "cannam"
Merge from 791:dc15818e132e
Apply same change as in 863f447c4d88 on cannam branch
Layout changes: move h2 into fieldset top line, etc
Merge from branch "feature_318"
Finish adding download link
Merge from branch "luisf"
Merge from branch "redmine-1.2"
Update to Redmine 1.2.1 on 1.2-stable branch (Redmine SVN rev 6270)
Pull out font name specifications from stylesheets and serve differently to different platforms (falling back to our usual web fonts). Fixes #212
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
Merge from branch "cannam-pre-20110113-merge"
Update to Redmine 1.2-stable branch (Redmine SVN rev 6000)
Merge from branch "bug_145"
Track the project tree explicitly through recursive functions rather than using lft, rgt ordering. Fixes #145
Check that user is permitted to see subproject, not only parent project. Fixes #152
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!
Introduce render_project_short_description into projects helper; use it in welcome page (latest projects) as well as project lists, to avoid text formatting appearing in these lists
As previous commit, but for project table (rather than "my" project list)
We don't actually want text formatting in our short summary, but we don't want wiki metacharacters either. So apply wiki formatting and then strip out the tags in a very naive fashion.
Merge from branch "feature_73"
Merge from branch "bug_97"
merge from feature_72
Remove "junk code"
Merge from branch "feature_72"
TEST DEV commit: creates the repository automatically;
Fix up entries, etc, from a current SVN checkout (for the same revision as previously)
Remove unwanted file
Update to Redmine trunk rev 4802
Merge from branch "bug_67"
Projects page: Sort and paginate table on the basis of root projects only; recurse to children (if any) after each root project is rendered. Fixes #67
Merge from branch "cannam-pre-20110113-merge". Brings in table reorganisation for Projects page; moves our scripts from extra/svn to extra/soundsoftware; reduces page min-width
Merge from branch "feature_64"
Merge from branch "feature_55"
Merge from branch "feature_75". Should have merged 5 commits ago. Oops
Un-track file that shouldn't be here
Bug #60:+ the "jump to project" input box is now below the search box+ the project ancestors are displayed in a separate line
Allow list of managers, if more than one row, to overlap with descriptionrather than pushing description down
Merge fixes for bug #51 and bug #35 from branch "cannam-pre-20110113-merge"
Bug #51: make New Member box show matching users only when at least 2 characters have been typed in search (avoid really long results lists)
Make the project list into a sortable table with a little more information in it
Merge from the default branch
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"
Merge from branch "cannam". Includes changes merged previously from luisf branch to provide user description field etc.
Feature #35:- Does not show the label "My Projects" if the user does not have any projects.- If the user is not signed in only shows the default Projects list.
Feature #35: The projects page now is separated in "My Projects" and "Other Projects".
merged with new version from trunk