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
Restore our original repos settings page. But I don't think this is going to work well with the new routes configuration
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
Update to Redmine SVN revision 11972 on 2.3-stable branch
Merge cannam's latest changes.
Mark intro text html safe
fixed the project _overview form_for (had one extra parameter); created route for a project's settings.
Merge from live
Update to Redmine SVN revision 11137 on 2.2-stable branch
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
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.
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 "luisf"
Merge from branch "cannam"
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_142"
Show styled member list in Members view for non-manager users; implement member editing partial in this view for manager users. Remove Members tab from Settings
Merge from branch "cannam-pre-20110113-merge"
Update to Redmine 1.2-stable branch (Redmine SVN rev 6000)
Merge from branch "feature_123"
Text and layout changes to try to clarify the Welcome page settings
Add the overview setting to the project settings. Still rather clumsy, but it does appear to work!
Merge from branch "live"
Merge from 315:de6af1693ef7
Merge from branch "feature_117"
Merge from branch "feature_73"
Fix error introduced in merge
Merge from branch "bug_97"
Do not show external checkbox/field until the repo has been automatically populatedPull external Hg as well as git and svn reposSome textual changes
Textual changes
Merge from branch "bug_95"
Layout changes: indent as block instead of just first line; loosen spacing at bottom of explanatory labels
merge from branch bug_95
merge from feature_72
added the description; changed the roles labels. minor fixes to layout.
Merge from branch "feature_72"
the status messages now depend on the repository type.
TEST DEV commit: creates the repository automatically;
repository scm not showing anymore.
Fix up entries, etc, from a current SVN checkout (for the same revision as previously)
URL field no longer mandatory; Delete repo button removed
dev commit
DEV commit: minor changes
: Enter commit message. Lines beginning with 'HG:' are removed.
DEV commit: working in the repository config tab
added js to external repository URL text field and checkbox.
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
text field for external repo URL
external repository check box.
Merge fixes for bug #51 and bug #35 from branch "cannam-pre-20110113-merge"
Bug #51: make New Member box show matching users only when at least 2 characters have been typed in search (avoid really long results lists)
Make repo-to-be-created text a label string, and make it a bit more helpful
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"
Merge from branch "cannam". Includes changes merged previously from luisf branch to provide user description field etc.
Bug #51: Unfinished and not completely tested - limits the number of displayed users to 10.
merged with new version from trunk