Mercurial > hg > soundsoftware-site
changeset 12:8100616a9904 yuya
* Merge with main repo
| author | Chris Cannam |
|---|---|
| date | Wed, 25 Aug 2010 12:11:25 +0100 |
| parents | e297bf495063 (diff) 2b5c13a9425f (current diff) |
| children | 80433603a2cd |
| files | extra/svn/SoundSoftware.pm |
| diffstat | 3 files changed, 20 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/extra/svn/SoundSoftware.pm Thu Aug 12 16:06:08 2010 +0100 +++ b/extra/svn/SoundSoftware.pm Wed Aug 25 12:11:25 2010 +0100 @@ -20,10 +20,10 @@ 2. Clone/pull from repo for private project: Project members only 3. Push to repo for public project: "Permitted" users only (this -means project members with the commit role, although hgwebdir may -impose its own restrictions afterwards) +probably means project members who are also identified in the hgrc web +section for the repository and so will be approved by hgwebdir?) -4. Push to repo for private project: "Permitted" users only +4. Push to repo for private project: "Permitted" users only (as above) =head1 INSTALLATION @@ -338,6 +338,9 @@ my $location = $r->location; my ($repo) = $r->uri =~ m{$location/*([^/]+)}; + + return $repo if (!$repo); + $repo =~ s/[^a-zA-Z0-9\._-]//g; # The original Redmine.pm returns the string just calculated as
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb Thu Aug 12 16:06:08 2010 +0100 +++ b/lib/redmine/scm/adapters/mercurial_adapter.rb Wed Aug 25 12:11:25 2010 +0100 @@ -141,7 +141,7 @@ hg_args << '-r' << "#{hgrev(identifier_from)}:#{hgrev(identifier_to)}" hg_args << '--limit' << options[:limit] if options[:limit] hg_args << without_leading_slash(path) unless path.blank? - doc = hg(*hg_args) { |io| REXML::Document.new(io.read.concat('</log>')) } + doc = hg(*hg_args) { |io| REXML::Document.new(io.read) } # TODO: ??? HG doesn't close the XML Document... doc.each_element('log/logentry') do |le|
--- a/public/themes/ssamr/stylesheets/application.css Thu Aug 12 16:06:08 2010 +0100 +++ b/public/themes/ssamr/stylesheets/application.css Wed Aug 25 12:11:25 2010 +0100 @@ -20,6 +20,19 @@ src: url('DroidSans-Bold.ttf'); } +@font-face +{ + font-family: Gillius; + src: url('GilliusADFNo2-Regular.otf'); +} + +@font-face +{ + font-family: Gillius; + font-weight: bold; + src: url('GilliusADFNo2-Bold.otf'); +} + body { background: #ffffff; color: #404040;