Merge branch 'master' of github.com:r888888888/danbooru

app/assets/stylesheets/specific/posts.css.scss

@@ -247,6 +247,13 @@ div#c-posts {
       margin-right: 7em;
     }
 
+    #favlist {
+      margin-left: 1.5em;
+      word-wrap: break-word;
+      max-height: 200px;
+      overflow: auto;
+    }
+
     #pool-nav, #search-seq-nav, #nav-help {
       li {
         position: relative;

app/logical/d_text.rb

@@ -80,6 +80,9 @@ class DText
     str = str.gsub(/\bpool #(\d+)/i, %{<a href="/pools/\\1">pool #\\1</a>})
     str = str.gsub(/\buser #(\d+)/i, %{<a href="/users/\\1">user #\\1</a>})
     str = str.gsub(/\bartist #(\d+)/i, %{<a href="/artists/\\1">artist #\\1</a>})
+    str = str.gsub(/\bissue #(\d+)/i, %{<a href="https://github.com/r888888888/danbooru/issues/\\1">issue #\\1</a>})
+    str = str.gsub(/\bpixiv #(\d+)(?!\/p\d|\d)/i, %{<a href="http://www.pixiv.net/member_illust.php?mode=medium&illust_id=\\1">pixiv #\\1</a>})
+    str = str.gsub(/\bpixiv #(\d+)\/p(\d+)/i, %{<a href="http://www.pixiv.net/member_illust.php?mode=manga_big&illust_id=\\1&page=\\2">pixiv #\\1/p\\2</a>})
   end
 
   def self.parse_list(str, options = {})

app/models/tag.rb

@@ -190,7 +190,7 @@ class Tag < ActiveRecord::Base
         end
 
       when :age
-        object =~ /(\d+)(s(econds?)?|mi(nutes?)?|h(ours?)?|d(ays?)?|w(eeks?)?|mo(nths?)?|y(ears?)?)/i
+        object =~ /(\d+)(s(econds?)?|mi(nutes?)?|h(ours?)?|d(ays?)?|w(eeks?)?|mo(nths?)?|y(ears?)?)?/i
 
         size = $1.to_i
         unit = $2

app/views/posts/partials/show/_information.html.erb

@@ -18,7 +18,7 @@
   <% if CurrentUser.is_privileged? && post.fav_count > 0 %>
     <%= link_to "&raquo;".html_safe, favorites_path(:post_id => post.id), :remote => true, :id => "show-favlist-link" %>
     <%= link_to "&laquo;".html_safe, "#", :id => "hide-favlist-link" %>
-    <div id="favlist" style="margin-left:1.5em; word-wrap:break-word"></div>
+    <div id="favlist"></div>
   <% end %></li>
   <li>
     Status: