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 "luisf"
Merge
Using correct arguments on form builder helper.
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
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
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"
Merge from branch "feature_36"
Merge from branch "cannam"
Minor layout fix for user show page
Merge from branch "redmine-1.2"
Update to Redmine 1.2.1 on 1.2-stable branch (Redmine SVN rev 6270)
Merge from branch "cannam-pre-20110113-merge"
Update to Redmine 1.2-stable branch (Redmine SVN rev 6000)
Merge from branch "feature_73"
Merge from branch "bug_97"
merge from feature_72
Fix up entries, etc, from a current SVN checkout (for the same revision as previously)
Update to Redmine trunk rev 4802
Merge from branch "feature_72", to provide just enough of the site support for external repos to permit testing while developing the conversion code
external repository check box.
Merge from branch "feature_64"
Merge from branch "feature_55"
fixed bugs with validation of forms.
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.
fixed no prompt issue for users with no institution selected
ssamr validation on my/account is now done correctlyother small bug fixes.
my account view working correctly.
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;
migration with new "institution_type" column in ssamr_user_details table.
radio buttons now rely on database
DEV commit - added new logic and view details.
corrected bug in the institution field while creating a new user.
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
Merge from branch "cannam". Includes changes merged previously from luisf branch to provide user description field etc.
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".
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