To check out this repository please hg clone the following URL, or open the URL using EasyMercurial or your preferred Mercurial client.
hg clone
History | View | Annotate | Download (24.2 KB)
Merge from live branch
Merge from branch redmine-2.5-integration
Merge from branch "redmine-2.4-integration"
Update to Redmine SVN revision 13367 on 2.5-stable branch
Merge from redmine-2.4 branch
Update to Redmine SVN revision 12979 on 2.4-stable branch
Merge from live branch. Still need to merge manually in files overridden by plugins.
Update to Redmine 2.4 branch rev 12663
Merge
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
Update to Redmine SVN revision 11972 on 2.3-stable branch
Merge from live
Update to Redmine SVN revision 11137 on 2.2-stable branch
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
Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)
Merge from branch "live"
Merge from branch "feature_36"
Merge from branch "luisf"
Merge from branch "cannam"
Merge from branch "feature_36" into a specially created integration branch
Merge from branch "redmine-1.2"
Update to Redmine 1.2-stable branch (Redmine SVN rev 6000)
model changes;
Update to Redmine trunk rev 4802
Merge from branch "feature_64"
created the model validation and the checkbox in the registration view.
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.
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)
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
changes to add SSAMR info. This is a development Commit - DO NOT USE this version.
merged with new version from trunk