Merge branch 'current_branch' into 'dev'

migrate update See merge request !96
8 years ago · 883cd8707a
parent 84f19a9031 a3fba6fff4
commit 883cd8707a
2 changed files with 2 additions and 1 deletions
--- a/progress/views.py
+++ b/progress/views.py
@ -35,7 +35,7 @@ class StudentWorkView(APIView):
                    server_status,
                    checker__out_key=teacher_token,
                    id__gt=last_id,
-                )[last_id:50]
+                )[last_id:100]
                return Response([ProgressLessonSerializer(i).data for i in progress_lessons], status=200)
            except ValidationError:
                return Response("Bad request", status=400)
--- a/requirements.txt
+++ b/requirements.txt
@ -15,6 +15,7 @@ psycopg2==2.7.3.1
 raven==6.2.1
 requests==2.18.4
 Unidecode==0.4.21
+PyJWT==1.5.3

 # amqp==2.2.2
 # Babel==2.5.1