Merge remote-tracking branch 'origin/development' into CoryChaplin-text_themes
authorDarren <darren@darrenwhitlen.com>
Wed, 7 May 2014 22:33:21 +0000 (23:33 +0100)
committerDarren <darren@darrenwhitlen.com>
Wed, 7 May 2014 22:33:21 +0000 (23:33 +0100)
commit1f49427e510c67118a0f0442f2231c686a705472
tree8c865930717d7c3f6aa24b881e2ee29bd670aedb
parent7804b7e88eb5d1001220e4b66999097bd490d2ce
parent88a9b153643f7652534cfd95187658e8633ceaca
Merge remote-tracking branch 'origin/development' into CoryChaplin-text_themes

* origin/development: (23 commits)
  Using Negotiator for accept-language parsing
  Client transports within config.js
  Don't automatically give focus when within an iframe
  MenuBox now a public component
  Startup applet correctly showing the info box
  Build script fix #531
  Missed HTML template update from previous commit
  Moving nick list toggle into the right bar
  More format adjustment :)
  Adjusted code format
  Added inspircd 396 numeric RPL_HOSTCLOACKING
  Extracting the right_bar into its own view with toggling logic
  using the .disabled CSS class when toggling right_bar
  Kiwi API: addMediaMessageType()
  Separating formatDate + only init'ing its vars once
  Date format language files
  Adding date.format to make date strings customisable to fit your locale
  Add visible check for updating banlist
  fix indentation (I should really have checked the diff better >_>)
  remove useless show
  ...

Conflicts:
client/build.js
server/settingsgenerator.js
24 files changed:
client/build.js
client/src/helpers/utils.js
client/src/index.html.tmpl
client/src/models/application.js
client/src/models/network.js
client/src/translations/cs.po
client/src/translations/de-de.po
client/src/translations/en-gb.po
client/src/translations/es-419.po
client/src/translations/es.po
client/src/translations/fr.po
client/src/translations/he.po
client/src/translations/it.po
client/src/translations/nl.po
client/src/translations/no.po
client/src/translations/pl.po
client/src/translations/pt-br.po
client/src/translations/ro.po
client/src/translations/ru.po
client/src/translations/tr.po
client/src/translations/uk.po
client/src/translations/vi.po
client/src/translations/zh-tw.po
config.example.js