Merge branch 'master' into page1

Conflicts:
	src/General/Index.coffee

src/General/Build.coffee

@@ -181,12 +181,16 @@ Build =
     else
       ''
 
-    if isOP and g.VIEW is 'index'
+    if isOP and g.VIEW is 'index' and Conf['JSON Navigation']
       pageNum   = Math.floor Index.liveThreadIDs.indexOf(postID) / Index.threadsNumPerPage
       pageIcon  = " <span class=page-num title='This thread is on page #{pageNum} in the original index.'>[#{pageNum}]</span>"
+    else
+      pageIcon = ''
+
+    if isOP and g.VIEW is 'index'
       replyLink = " &nbsp; <span>[<a href='/#{boardID}/res/#{threadID}' class=replylink>Reply</a>]</span>"
     else
-      pageIcon = replyLink = ''
+      replyLink = ''
 
     container = $.el 'div',
       id: "pc#{postID}"

src/General/Config.coffee

@@ -672,11 +672,11 @@ vp-replace
     # Board Navigation
     'Front page': [
       '0'
-      'Jump to page 0.'
+      'Jump to front page.'
     ]
     'Open front page': [
       'Shift+0'
-      'Open page 0 in a new tab.'
+      'Open front page in a new tab.'
     ]
     'Next page': [
       'Shift+Right'

src/General/Index.coffee

@@ -163,13 +163,13 @@ Index =
   getCurrentPage: ->
     +window.location.pathname.split('/')[2] or 1
   userPageNav: (pageNum) ->
+    Navigate.pushState if pageNum is 1 then './' else pageNum
     if Conf['Refreshed Navigation'] and Conf['Index Mode'] isnt 'all pages'
       Index.update pageNum
     else
       Index.pageNav pageNum
   pageNav: (pageNum) ->
     return if Index.currentPage is pageNum
-    history.pushState null, '', if pageNum is 1 then './' else pageNum
     Index.pageLoad pageNum
   pageLoad: (pageNum) ->
     Index.currentPage = pageNum
@@ -492,6 +492,7 @@ Index =
       Index.buildIndex()
       Index.setPage()
     else
+      Navigate.pushState if pageNum is 1 then './' else pageNum
       Index.pageNav pageNum
 
   querySearch: (query) ->

src/General/Navigate.coffee

@@ -198,7 +198,7 @@ Navigate =
     if threadID
       view = 'thread'
     else
-      pageNum = view
+      pageNum = +view
       view = 'index' # path is "/boardID/". See the problem?
 
     if view is g.VIEW and boardID is g.BOARD.ID
@@ -302,6 +302,10 @@ Navigate =
     if Conf['Unread Count']
       Navigate.ready 'Unread Count', Unread.ready, Conf['Unread Count']
 
+  pushState: (path) ->
+    history.pushState null, '', path
+    Navigate.path = window.location.pathname
+
   popstate: ->
     return if window.location.pathname is Navigate.path
     a = $.el 'a',