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"
Update to Redmine SVN revision 13367 on 2.5-stable branch
Merge from default 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 fix from luisf branch
Merge from branch "bug_794"
Makes the default radio button checked by default -- this should fix bug #794.
Merge from redmine-2.2-integration branch. We're going live!
Prepare simplification of front page
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
Converting fields_for ... :builder => TabularFormBuilder to labelled_fields_for seems like the thing to do
Merge from live
Update to Redmine SVN revision 11137 on 2.2-stable branch
Merge from the default branch
Merge from cannam_integration
Merge from branch "redmine-1.3"
Remove .svn directories from subdirectories in preparation for merging from newer svn repo format
Merge from branch "cannam"
Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)
Rename .rhtml files to .html.erb in preparation for merge
Merge from branch "live"
Remove language field; we only handle English
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)
Update to Redmine 1.2-stable branch (Redmine SVN rev 6000)
Fix up entries, etc, from a current SVN checkout (for the same revision as previously)
Remove two unwanted files erroneously introduced in previous merge. These have previously been removed in bb7cac2ac146, but on a different branch
Merge from branch "luisf". This merges the label change from Files to Downloads
Update to Redmine trunk rev 4802
removed 2 files that should not be here (related to previous experiences with T&C)
Merge from branch "feature_64"
feature_64: link to terms and conditions wiki page; fixed form resubmission bug.
created the model validation and the checkbox in the registration view.
Merge from branch "feature_55"
orders the institution select dropdown by the db's order field
added nobr tags to the institution fields in order to prevent line breaks.
fixed html character issue in Institutions list.
labels correctly namedinstitution field is now mandatory and validated.
new javascript to hold registration page specific functions.registration page specific behaviour.
new javascript for institution field handling.
. institution field correctly handled in the user edit and show forms, and in the register view;
DEV commit - added new logic and view details.
development commit: terms and conditions.
development commit: terms and conditions
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"
Feature #1:Fixed the collection_select variable issueUser edit view: removed wiki toolbar and description from the description text area in the user;User edit view: added institutions collection select;User show view: institution name now visible.Users_controller: fixed a bug retrieving the institution name
Working, but needs one migration which was not pushed from my c4dm desktop computer.
- Removed Wiki Toolbar from DEscription input box- Added the Institution dropdown to the registration view
Merge from branch "cannam". Includes changes merged previously from luisf branch to provide user description field etc.
Remove spare linebreak
Bug #57 - User Description can be entered as wiki text and is displayed as such.
Added a description string to the user's description field, to make it more "informative".
Correctly prints the error messages if user description is blank.
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.
changes to add SSAMR info. This is a development Commit - DO NOT USE this version.
merged with new version from trunk