Changeset 846

Show
Ignore:
Timestamp:
04/20/08 12:06:28 (4 months ago)
Author:
seancribbs
Message:

Merge.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/radiant/CHANGELOG

    r845 r846  
    11== Change Log 
    22 
    3 === Edge 
     3=== 0.6.5.1 Chiseled 
     4* Make sure extension view paths override Radiant view paths. [Josh French] 
    45* Fix problem in framework.rake when public/javascripts/admin doesn't exist. 
    56[Sean Cribbs] 

  • trunk/radiant/CONTRIBUTORS

    r845 r846  
    55core: 
    66 
    7 === Edge 
     7=== 0.6.5.1 Chiseled 
     8* Josh French 
    89* Sean Cribbs 
    910 

  • trunk/radiant/lib/radiant.rb

    r768 r846  
    66      Major = '0' 
    77      Minor = '6' 
    8       Tiny  = '5' 
     8      Tiny  = '5.1' 
    99 
    1010      class << self 

  • trunk/radiant/lib/radiant/initializer.rb

    r816 r846  
    139139        view_paths.each do |vp| 
    140140          unless ActionController::Base.view_paths.include?(vp) 
    141             ActionController::Base.append_view_path vp 
     141            ActionController::Base.prepend_view_path vp 
    142142          end 
    143143        end