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 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
We have a MyHelper now, so we need a MyHelperPatch (also some other minor fixes)
Merge from branch "cannam"
Merge from branch "live"
Fix dodgy merge, syntax, defaults
Various fixes to colleagues box
Merge
Some layout and fixes
Add "People I'm working with" as My Page box -- currently off by default
Merge from branch live
Small wording and layout fix
Merge from branch cannam
Override "My Projects" partial as used in My Page so as to show tags; ensure tags stylesheet is included
Merge from branch "feature_550"
Make "my projects" box on My Page look nice when user has no projects (invite them to create one)
Merge from live
Update to Redmine SVN revision 11137 on 2.2-stable branch
Add "My Page" box for my projects. Currently this also affects the layout of the non-My-Page version of the My Projects list, need to adjust that
Merge from the default branch
Merge from cannam_integration
Rename .erb to .html.erb in line with the convention
needs further testing Moved several files' extension to ".erb"; modified two files because they were calling partials/templates with rhtml extensions; renamed email templates sent when a user is added to a publication.
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
Add New Project link to My page, fixing #361
Merge from branch "feature_36"
Change "View all issues" to "View all watched issues" for watched issues box in My Page
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)
Merge from branch "cannam-pre-20110113-merge"
Update to Redmine 1.2-stable branch (Redmine SVN rev 6000)
Merge from branch "cannam-pre-20110113-merge" (includes merge from feature_121)
Merge from branch "feature_121"
Ensure Recent Activity shows only activity on projects the user is actually a member of, if invoked from My Page (rather than on all permitted projects)
Merge from branch "feature_124"
Add Tip of the Day as a block for My Page (on by default)
Merge from branch "feature_122"
Add Recent Activity partial, include it as a block in My Page (on by default) and in the project information page
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_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.
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
my account view working correctly.
labels correctly namedinstitution field is now mandatory and validated.
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
merged with new version from trunk