From: Darren <darren@darrenwhitlen.com>
Date: Sun, 27 Oct 2013 13:09:00 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/development' into M2ys4U-server-time
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=994926fcc7dfbef205029532ac81960e1cc984ba;p=KiwiIRC.git

Merge remote-tracking branch 'origin/development' into M2ys4U-server-time

# By Darren (14) and Jack Allnutt (3)
* origin/development:
  Correctly using application template (fixes timestamps/theme/css class issues)
  Restoring conf.public_http config option for backwards compatibility
  .gitignore update
  Moving index.html out of the assets folder - the page is not an asset of itself
  Move src files out of assets dir
  Update dependency. socksjs 0.4.1 -> 0.4.3
  Caching jquery objects in doLayout
  Panel list fix
  Remove external image dependancy
  Application HTML as a template to delay HTML parsing/painting
  Not waiting for settings.json for production files to load; BootManager
  Update dependencies
  Clickable channels in chanlist applet
  Updating build script for previous commit
  Client loading script in correct order
  Query panel fixes
  Transition background background on nick highlights
---

994926fcc7dfbef205029532ac81960e1cc984ba