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-pre-20110113-merge". Includes fix for bug #169.
Merge from branch bug_169
Introduce a method on the sys controller to clear a repository cache; use a file in the mirror dir to notify the Ruby external repo script that it needs to call it
model changes;
Merge from branch "feature_126"
Merge
Turn general News box on site front page into a Site News box (#126)
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
Merge from branch "bug_97"
Merge from branch "feature_73"
merge from branch bug_97
removed unnecessary debug messages
fixed template variable problems; created subject label; fixed old labels
DEV commit: created template; need to solve bug in template variables.
added feature to send mails to user when added to project; TODO: need to create template.
merge from feature_72
Merge from branch "feature_72"
Fix up entries, etc, from a current SVN checkout (for the same revision as previously)
Merge from branch "live"
URL field no longer mandatory; Delete repo button removed
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 "feature_64"
created the model validation and the checkbox in the registration view.
Merge from branch "feature_55"
labels correctly namedinstitution field is now mandatory and validated.
Issue #31: issue submitters and assignees are added to the watchers list.incomplete: there is no option to select/unselect the assignee.
Merge from live branch
Merge fixes for bug #51 and bug #35 from branch "cannam-pre-20110113-merge"
Make project descriptions briefer on the projects list, and ensure that images &c are removed from them
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"
Created a model for the Intitutions;Created a seed file to initialize the db;
Merge from branch "cannam". Includes changes merged previously from luisf branch to provide user description field etc.
Merge from branch "luisf"
Correctly outputs an error message if the user's description field is not set.
Validation of description fields (INCOMPLETE: error messages are not displayed correctly)
Now correctly creates a new user with the description
DEVELOPMENT COMMIT: The description can now be seen and edited BUT when a new user registers the informations is not saved to the correct table.
a few fixes
Wrong naming convention correction.
changes to add SSAMR info. This is a development Commit - DO NOT USE this version.
merged with new version from trunk