Anthony Woods 2e9272c778 Merge remote-tracking branch 'upstream/master' into apiPlugin

2016-01-30 01:38:01 +08:00

..

api

Merge remote-tracking branch 'upstream/master' into apiPlugin

2016-01-30 01:38:01 +08:00

bus

clarify which handler is not found

2015-06-26 12:32:24 -07:00

cmd

Merge branch 'new_macaron'

2016-01-13 15:48:49 +01:00

components

fix(png rendering): removed --ssl-protocol=any phantomjs param

2016-01-13 15:07:03 +01:00

events

feat(signup): progress on new sign up and email verification flow, #2353

2015-08-28 15:14:24 +02:00

log

fix(windows): exclude syslog feature from windows builds

2015-12-14 16:16:36 +01:00

login

fix(login): fix vulnerbility for timing attacks

2016-01-18 08:38:32 +01:00

metrics

feat(playlist): add usage statisics

2016-01-25 21:39:45 +01:00

middleware

Merge branch 'new_macaron'

2016-01-13 15:48:49 +01:00

models

Merge remote-tracking branch 'upstream/master' into apiPlugin

2016-01-30 01:38:01 +08:00

plugins

merge apiPlugins with appPlugins

2016-01-22 01:15:04 +08:00

services

Merge remote-tracking branch 'upstream/master' into apiPlugin

2016-01-30 01:38:01 +08:00

setting

feat(macaron): upgrades macaron version

2016-01-13 15:11:23 +01:00

social

gofmt happiness

2015-11-07 11:32:06 -06:00

util

use PBKDF2 to esnure key is 23bytes.

2016-01-26 05:15:29 +08:00