mitri4
/
LilSchool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • ce2ed4a70b Remove not needed imports Ivlev Denis 2018-02-09 11:05:29 +0300
  • ac3f21ad6d Splitting serializers by own files Ivlev Denis 2018-02-09 11:04:53 +0300
  • a101f7ca6a Merge branch 'feature/api' of gitlab.com:lilcity/backend into feature/create-edit-courses Vitaly Baev 2018-02-09 10:38:55 +0300
  • c91675b6fa Взаимодействие с API Vitaly Baev 2018-02-09 10:38:48 +0300
  • ea79c0d0fc LIL-223. Update course create serializer Ivlev Denis 2018-02-09 09:47:07 +0300
  • 70f08c0d74 Merge branch 'feature/api' of gitlab.com:lilcity/backend into feature/create-edit-courses Vitaly Baev 2018-02-08 18:19:30 +0300
  • 89866df703 Add ordering for User by date_joined field Ivlev Denis 2018-02-08 15:28:16 +0300
  • d4787cd87e Merge branch 'dev' of gitlab.com:lilcity/backend into dev Ivlev Denis 2018-02-08 14:47:29 +0300
  • bbccc9996d Merge remote-tracking branch 'origin/dev' into dev nikita 2018-02-08 14:33:53 +0300
  • 45cab2b44a Docker-compose PORT variable nikita 2018-02-08 14:33:15 +0300
  • b701ff3c10 Update Material serializers Ivlev Denis 2018-02-08 14:01:33 +0300
  • 3394da5a20 Update Material model Ivlev Denis 2018-02-08 13:58:56 +0300
  • fe558ae1ee Fix serializer mapping on some viewsets Ivlev Denis 2018-02-08 13:58:11 +0300
  • dd1f0c0422 Fix ImageSerializer Ivlev Denis 2018-02-08 13:57:30 +0300
  • 5b6245722c Update content app serializers Ivlev Denis 2018-02-08 13:51:42 +0300
  • 8de287f4fe Update Image(Content) serializers Ivlev Denis 2018-02-08 13:44:42 +0300
  • adbdfaf0ef Update Lesson serializers Ivlev Denis 2018-02-08 13:40:51 +0300
  • 96978c5794 Update Course serializers Ivlev Denis 2018-02-08 13:34:18 +0300
  • 338732b35c Merge branch 'feature/api' of gitlab.com:lilcity/backend into feature/create-edit-courses Vitaly Baev 2018-02-08 13:14:51 +0300
  • c691f06ef8 Fixes Vitaly Baev 2018-02-08 13:14:46 +0300
  • c843c0f353 Update GalleryImage serializers and viewset Ivlev Denis 2018-02-08 13:08:29 +0300
  • 1e2fa48434 Fix price field help text Ivlev Denis 2018-02-08 13:07:56 +0300
  • f743417e01 Merge feature/api Vitaly Baev 2018-02-08 12:01:41 +0300
  • b29027c2e6 Мелкие правки Vitaly Baev 2018-02-08 11:57:52 +0300
  • a3f3ae764e Clean not needed serializers Ivlev Denis 2018-02-08 11:55:04 +0300
  • f66b9c080d Update Course serializer Ivlev Denis 2018-02-08 11:51:08 +0300
  • f541c56d7d Add gallery field to Course model Ivlev Denis 2018-02-08 11:48:44 +0300
  • 451659cac8 Fix Gallery serializer & viewset Ivlev Denis 2018-02-08 11:44:05 +0300
  • 5ac3bc901b Update api views Ivlev Denis 2018-02-08 11:41:23 +0300
  • 9e0f2ea9e6 Update course app serializers Ivlev Denis 2018-02-08 11:32:43 +0300
  • 7e332af5c5 Update Lesson model Ivlev Denis 2018-02-08 11:30:12 +0300
  • 1f71df4c72 Fix Content model Ivlev Denis 2018-02-08 11:23:34 +0300
  • 41c377f6df Add Course migration and fix fixtures Ivlev Denis 2018-02-08 11:23:20 +0300
  • 0a0f03b95c Update Course model Ivlev Denis 2018-02-08 11:22:44 +0300
  • 2d5b221349 Update GalleryImage model Ivlev Denis 2018-02-08 09:37:52 +0300
  • 28ebc6b1ee Update ImageText(Content) model Ivlev Denis 2018-02-08 09:32:58 +0300
  • 3a1260d7d8 Update Image(Content) model Ivlev Denis 2018-02-08 09:30:25 +0300
  • 7436423474 LIL-224. Update ImageObject admin Ivlev Denis 2018-02-08 08:58:18 +0300
  • dabff59eb5 LIL-224. Add datable fields to ImageObject model Ivlev Denis 2018-02-08 08:53:06 +0300
  • 75d59cf622 LIL-224. Add serializer, viewset, route, admin for ImageObject model Ivlev Denis 2018-02-08 08:37:46 +0300
  • bed9b3eb98 LIL-224. Add ImageObject model Ivlev Denis 2018-02-08 08:23:58 +0300
  • 325abf5a9a Add static files url patterns Ivlev Denis 2018-02-07 22:21:28 +0300
  • b02aa5c273 More fastest query Course list Ivlev Denis 2018-02-07 22:21:06 +0300
  • fd2fb657b6 LIL-223. Add content to prefetch related in Course viewset Ivlev Denis 2018-02-07 22:19:38 +0300
  • 9d699ed59e LIL-223. Add related name for course & lesson fields of Course model Ivlev Denis 2018-02-07 22:18:47 +0300
  • a17c49ce4b LIL-223. Add content to Course serializer Ivlev Denis 2018-02-07 22:17:58 +0300
  • 60097d36ca Remove not needed migrations Ivlev Denis 2018-02-07 22:14:53 +0300
  • a26c8e604f Merge branch 'dev' into feature/api Ivlev Denis 2018-02-07 17:28:10 +0300
  • ddab06639b Crop image at center on backend Ivlev Denis 2018-02-07 17:10:29 +0300
  • 839806b0d2 LIL-183. Only you can edit your profile Ivlev Denis 2018-02-07 16:12:56 +0300
  • 877d65f5d8 LIL-183. Add photo field to user edit form Ivlev Denis 2018-02-07 16:10:14 +0300
  • d2904daefc LIL-182. Fix user edit template Ivlev Denis 2018-02-07 16:09:33 +0300
  • 38eef988d4 Add LOGIN_URL to main page Ivlev Denis 2018-02-07 16:08:05 +0300
  • e5d1f83ea8 Компонент селекта Vitaly Baev 2018-02-07 14:58:10 +0300
  • e14b64bae6 Update static Ivlev Denis 2018-02-07 14:09:27 +0300
  • 1cba3ab59f Add gender choice handler Ivlev Denis 2018-02-07 14:09:05 +0300
  • c8dc6df16f Add style for info message Ivlev Denis 2018-02-07 14:08:30 +0300
  • 086792afb9 LIL-182. Update user edit template Ivlev Denis 2018-02-07 14:07:53 +0300
  • c4cea788d3 LIL-183. Add user edit view Ivlev Denis 2018-02-07 14:06:34 +0300
  • 396c334330 Add user edit form Ivlev Denis 2018-02-07 14:05:40 +0300
  • f0471282b9 Allow null for country & city fields of user model Ivlev Denis 2018-02-07 14:05:21 +0300
  • faa5c166c7 Merge branch 'dev' into feature/profile Ivlev Denis 2018-02-07 08:32:01 +0300
  • 2bb2f86fd9 Use "no cover" img, if course not have cover Ivlev Denis 2018-02-07 08:13:34 +0300
  • 03e0729e76 Add "no cover" img Ivlev Denis 2018-02-07 08:12:24 +0300
  • 6f76624212 LIL-194 LIL-192 LIL-193 - Компоненты блоков курсов и уроков, конструктор курса (WIP) Vitaly Baev 2018-02-06 22:59:19 +0300
  • 0e6de0b551 LIL-175. Add serialized data of nested objects of Course model on list & retrieve actions Ivlev Denis 2018-02-06 18:42:00 +0300
  • cb53f51a72 LIL-183. Add simple user edit view. Ivlev Denis 2018-02-06 17:49:27 +0300
  • 8a0c785b7a LIL-181. Add edit profile template Ivlev Denis 2018-02-06 17:48:20 +0300
  • baafd69210 LIL-181. Fix link to edit profile on profile page Ivlev Denis 2018-02-06 17:47:42 +0300
  • 71bec97bd6 Add birthday to User model Ivlev Denis 2018-02-06 17:12:48 +0300
  • 33b6a7e0cc Merge remote-tracking branch 'origin/feature/api' into feature/api Vitaly Baev 2018-02-06 16:48:05 +0300
  • a4528d9722 Fix celery workers start cmd Ivlev Denis 2018-02-06 15:50:43 +0300
  • aaec799aa1 Fix base template Ivlev Denis 2018-02-06 15:31:45 +0300
  • 9ebacfcb0f LIL-216. Add upload image endpoints and viewsets. Ivlev Denis 2018-02-06 14:10:32 +0300
  • a21997c090 LIL-217. Upload user photo. Ivlev Denis 2018-02-06 13:32:52 +0300
  • 2577a28628 LIL-176, LIL-180. Add permissions Ivlev Denis 2018-02-06 12:40:37 +0300
  • 54e9841382 LIL-177. Add serializer, viewset, route for Lesson model Ivlev Denis 2018-02-06 11:36:53 +0300
  • aa7f280a00 Add ordering for category model Ivlev Denis 2018-02-06 09:33:11 +0300
  • c0d310881a LIL-211. Now all tags in swagger docs collapsed Ivlev Denis 2018-02-06 09:21:58 +0300
  • 19962768c2 LIL-214, LIL-215. Add searsh, filter, ordering params to viewsets Ivlev Denis 2018-02-06 09:19:44 +0300
  • 6c84ecb64d Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-02-06 08:45:37 +0300
  • 45676787a7 Fix present comments Ivlev Denis 2018-02-05 19:17:24 +0300
  • 214e35e5f0 Fix comments Ivlev Denis 2018-02-05 19:12:13 +0300
  • c0402a514e Merge branch 'dev' into feature/api Ivlev Denis 2018-02-05 18:51:50 +0300
  • e5c948e1b1 LIL-179. Add serializer, viewset, route for User model Ivlev Denis 2018-02-05 18:47:27 +0300
  • c5d218337a Правки из списка Vitaly Baev 2018-02-05 18:34:23 +0300
  • 65f710736c Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-02-05 17:00:24 +0300
  • 9c319c45a0 LIL-166. Add serializer, viewset, route, admin, models Gallery & GalleryImage Ivlev Denis 2018-02-05 16:16:47 +0300
  • 3412647846 LIL-163-167. Add serializer, viewset, route for Image, Text, ImageText, Video models Ivlev Denis 2018-02-05 15:49:09 +0300
  • 815089685e LIL-162. Add ordering for Content model Ivlev Denis 2018-02-05 15:47:43 +0300
  • 670a1f485e LIL-163-167. Add app Content with models Content, Image, Text, ImageText, Video Ivlev Denis 2018-02-05 15:19:53 +0300
  • 43582f40a4 Lil-212, LIL-213. Add serializer, viewset, route for Material & Like models Ivlev Denis 2018-02-05 13:54:32 +0300
  • 7ed07fef28 LIL-211. Add corsheaders Ivlev Denis 2018-02-05 13:46:27 +0300
  • d2c9a857b6 LIL-184. Add serializer, viewset, route for Category model Ivlev Denis 2018-02-05 12:58:50 +0300
  • 301dee671a LIL-175. Optimize CourseViewSet queryset Ivlev Denis 2018-02-05 12:51:00 +0300
  • 4396fdfefd LIL-211. Add django-silk for profiling requests Ivlev Denis 2018-02-05 12:45:36 +0300
  • 1fca200e81 LIL-175 Add serializer, viewset, route for Course model Ivlev Denis 2018-02-05 11:20:17 +0300
  • fa23e1bfe8 LIL-211. Fix drf settings Ivlev Denis 2018-02-05 11:19:14 +0300
  • 94fb931723 LIL-211. Add ExtendedModelViewSet Ivlev Denis 2018-02-05 11:17:17 +0300
  • 8dd14376f7 Lil-211. Add drf settings Ivlev Denis 2018-02-05 11:00:52 +0300