Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

public/javascripts/application.js

@@ -629,7 +629,7 @@ function img_thumbnails() {
   $('.thumbnails a').colorbox({rel:'nofollow'});
   $('.attachments').find('a').each(function(index, element) {
     var href_value = $(element).attr('href');
-    if (/\.(jpg|png|gif|bmp|PNG|BMP|GIF|JPG)$/.test(href_value)) {
+    if (/\.(jpg|png|gif|bmp|jpeg|PNG|BMP|GIF|JPG|JPEG)$/.test(href_value)) {
       $(element).colorbox({rel:'nofollow'});
     }