projects / KiwiIRC.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8768fa0 7854356)
Merge remote-tracking branch 'origin/M2Ys4U-promise' into development
authorDarren <darren@darrenwhitlen.com>
Sat, 18 Oct 2014 17:44:40 +0000 (18:44 +0100)
committerDarren <darren@darrenwhitlen.com>
Sat, 18 Oct 2014 17:44:40 +0000 (18:44 +0100)
commit2be000b604b44c010581b94b9026dcb98f90510c
treeed141cbbfc1e085e4a89a3c40f55802d3f1a23d1tree | snapshot (zip tar.gz)
parent8768fa0c30ab73f01bce761593c01008688a7bb6commit | diff
parent7854356b140a5f6a24db496a73d92dbd19158788commit | diff
Merge remote-tracking branch 'origin/M2Ys4U-promise' into development

* origin/M2Ys4U-promise:
  Removing unneeded plugin callbacks
  index.html comments
  Updating client-side PluginInterface to its server-side version
  var name formatting
  Re-implementing PluginInterface event.wait
  PluginInterface.emit readability
  Simplify the settings generator
  Use promise version of PluginInterface on the client
  Modify PluginInterface to use promises on server
  Use promises at startup
client/src/views/channel.js diff1 | diff2 | blob | history