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 (8.6 KB)
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 branch "cannam"
Add "People I'm working with" as My Page box -- currently off by default
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"
Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)
Merge from branch "luisf"
Merge
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)
Merge from branch "feature_64"
Merge from branch "feature_55"
fixed bugs with validation of forms.
fixed issue with users with no entry in the ssamr_user_details_table.added javascript for those users in the my/account view.
ssamr validation on my/account is now done correctlyother small bug fixes.
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 #52: All users can now view and edit their description and university
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
DEV commit: editing the show method in the users controller
Merge from branch "cannam". Includes changes merged previously from luisf branch to provide user description field etc.
Bug #45 - fixed the user show method in the users view
Users status can now be changed (activated/locked)
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.
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