Merge branch 'dev' into hohoTT-dev

2015-08-16 14:20:31 +08:00
parent aa99e9f634 de25b6c218
commit dc67491e6e
17 changed files with 419 additions and 199 deletions
--- a/account/serializers.py
+++ b/account/serializers.py
@@ -26,7 +26,7 @@ class UserRegisterSerializer(serializers.Serializer):

 class UserChangePasswordSerializer(serializers.Serializer):
    username = serializers.CharField(max_length=30)
-    old_password = serializers.CharField(max_length=30, min_length=6)
+    old_password = serializers.CharField()
    new_password = serializers.CharField(max_length=30, min_length=6)