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 branch bug_635
Fix routes and safe attributes for the external repo settings
Merge
Merge from live branch
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
Merge from branch "redmine-2.2"
Update to Redmine SVN revision 11972 on 2.3-stable branch
Update to Redmine SVN revision 11972 on 2.2-stable branch
Merge cannam's latest changes.
Fix project members page: update editlist partial following changes to project member settings partial; update mailer class and templates; make editlist forms not be remote (we just reload page)
Merge from branch "cannam"
Fix failure to truncate long descriptions without carriage returns in them correctly
Fix "uninitialized constant Redmine::Scm::Adapters::CommandFailed" (see https://www.chiliproject.org/projects/chiliproject/repository/revisions/cbcce704006c6827b4a3134a2dda9de7c47f18ae)
Merge from live
Update to Redmine SVN revision 11137 on 2.2-stable branch
Changing the way the bibtex is parsed: uses link_to_remote instead of remote_form_for; using RJS; created tab helper (still not implemented correctly in terms of views
Merge from branch "live"
Merge from branch "bug_505"
Merge (Bug #505 fix).
Fixes Bug #505 (introduced in Bug #97): now also sends emails to all users members of a group when the group is added to a project.
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
Fixes the deprecated use of visible_by.
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)
Merge from branch "feature_36"
Transplant rev 65abc6b39292 from live branch
Transfer custom welcome-page code from mainline to bibliography plugin code.This is far too awkward. We need a better way.
Merge from branch "luisf"
Added method to retrieve a user's institution name to the ssamr_user_detail Model.
Merge from branch "redmine-1.2"
Update to Redmine 1.2.1 on 1.2-stable branch (Redmine SVN rev 6270)
Merge from branch "feature_36" into a specially created integration branch
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 fix for bug #169.
Merge from branch bug_169
Introduce a method on the sys controller to clear a repository cache; use a file in the mirror dir to notify the Ruby external repo script that it needs to call it
model changes;
Merge from branch "feature_126"
Turn general News box on site front page into a Site News box (#126)
Introduce render_project_short_description into projects helper; use it in welcome page (latest projects) as well as project lists, to avoid text formatting appearing in these lists
Merge from branch "bug_97"
Merge from branch "feature_73"
merge from branch bug_97
removed unnecessary debug messages
fixed template variable problems; created subject label; fixed old labels
DEV commit: created template; need to solve bug in template variables.
added feature to send mails to user when added to project; TODO: need to create template.
merge from feature_72
Merge from branch "feature_72"
Fix up entries, etc, from a current SVN checkout (for the same revision as previously)
URL field no longer mandatory; Delete repo button removed
Update to Redmine trunk rev 4802
Merge from branch "bug_67"
Projects page: Sort and paginate table on the basis of root projects only; recurse to children (if any) after each root project is rendered. Fixes #67
Merge from branch "feature_64"
created the model validation and the checkbox in the registration view.
Merge from branch "feature_55"
labels correctly namedinstitution field is now mandatory and validated.