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

Commit Graph

  • e631905c60 Merge branch 'feature/create-edit-courses' into dev Vitaly Baev 2018-02-13 16:24:24 +0300
  • 3c6458bbc5 Правки редактирования курса Vitaly Baev 2018-02-13 16:18:30 +0300
  • d16142c5a2 Merge branch 'dev' of gitlab.com:lilcity/backend into feature/create-edit-courses Vitaly Baev 2018-02-13 16:00:37 +0300
  • 859bbbb0d1 Fix course serializer Ivlev Denis 2018-02-13 16:00:00 +0300
  • ef9fc9b8ee Merge branch 'dev' of gitlab.com:lilcity/backend into feature/create-edit-courses Vitaly Baev 2018-02-13 15:02:20 +0300
  • 9a84fb7c6f Dont show add course menu item if user not have perms Ivlev Denis 2018-02-13 14:27:34 +0300
  • 386ef31850 Merge feature/api Vitaly Baev 2018-02-13 14:12:31 +0300
  • 576320a570 Сборка CSS и JS через webpack Vitaly Baev 2018-02-13 14:10:21 +0300
  • d9564b6fec Fix create link and view Ivlev Denis 2018-02-13 14:01:07 +0300
  • 89d23f11a3 Fix user menu Ivlev Denis 2018-02-13 13:51:59 +0300
  • 7e97db39f8 Update super user fixture Ivlev Denis 2018-02-13 13:46:15 +0300
  • 6329878c10 Fix Course representation Ivlev Denis 2018-02-13 13:34:45 +0300
  • 455f6ebe0f Fix Course representation on save Ivlev Denis 2018-02-13 13:20:33 +0300
  • 8d69cfa7de LIL-190 - Взаимодействие с API при редактировании курса/уроков Vitaly Baev 2018-02-13 13:17:38 +0300
  • 585116fcc0 Add deactivated_at field to Course & Lesson serializers Ivlev Denis 2018-02-13 13:12:30 +0300
  • bd94c0977f LIL-229. Add soft delete functional for Course & Lesson model Ivlev Denis 2018-02-13 12:08:19 +0300
  • 77a0bb26e8 Fix token auto create signal Ivlev Denis 2018-02-13 12:07:12 +0300
  • 01e09741f6 Auto create auth token for user Ivlev Denis 2018-02-13 11:50:42 +0300
  • 4d320362e2 Remove not needed from base template Ivlev Denis 2018-02-13 11:13:52 +0300
  • 69a4bf1c16 LIL-227. Add simple course edit template Ivlev Denis 2018-02-13 11:13:31 +0300
  • a8a9d9ddfa LIL-227. Add course edit view Ivlev Denis 2018-02-13 11:13:06 +0300
  • f897296374 LIL-209 - Сборка SASS с помощью webpack Vitaly Baev 2018-02-13 10:58:22 +0300
  • ba0dacfa24 Move spaghetti code to mixins Ivlev Denis 2018-02-13 09:44:40 +0300
  • 0bfd3f1415 Fix LessonSerializer Ivlev Denis 2018-02-13 08:56:07 +0300
  • 98a51574db Optimize vars Ivlev Denis 2018-02-13 08:33:57 +0300
  • af58cf44af LIL-227. Add serialized user data to window Ivlev Denis 2018-02-13 08:12:22 +0300
  • 586c7163c0 Check is user authenticated Ivlev Denis 2018-02-12 20:10:51 +0300
  • 6744a0de1f LIL-227. Add tocken to js, and disable add course link, if user non have perms Ivlev Denis 2018-02-12 19:57:26 +0300
  • b29efd4069 More fastest fwtch course detail page Ivlev Denis 2018-02-12 18:49:18 +0300
  • 53bc834202 LIL-206. Add meta descriptiont Ivlev Denis 2018-02-12 16:21:43 +0300
  • 8322c6e30f LIL-225. Add content blocks to lesson page Ivlev Denis 2018-02-12 16:12:31 +0300
  • df1c1e9b82 LIL-225. Add gallery template Ivlev Denis 2018-02-12 16:09:22 +0300
  • 8e2448c5fc LIL-225. Add styles to content block templates Ivlev Denis 2018-02-12 15:56:47 +0300
  • 0bff92cbfa LIL-225. Add content block simple styles Ivlev Denis 2018-02-12 15:55:59 +0300
  • f290e4f80e Merge branch 'feature/api' of gitlab.com:lilcity/backend into feature/create-edit-courses Vitaly Baev 2018-02-12 15:54:10 +0300
  • 27b7086c78 Merge branch 'feature/api' into feature/courses Ivlev Denis 2018-02-12 14:29:52 +0300
  • 58ee75a2b7 Clean Ivlev Denis 2018-02-12 14:29:13 +0300
  • 27d9c78191 Fix Lesson save Ivlev Denis 2018-02-12 14:20:01 +0300
  • 475aca31b4 Merge branch 'feature/api' of gitlab.com:lilcity/backend into feature/create-edit-courses Vitaly Baev 2018-02-12 13:47:49 +0300
  • 33a2624def Fix course save Ivlev Denis 2018-02-12 13:45:39 +0300
  • d3f9f0b150 Merge branch 'feature/api' of gitlab.com:lilcity/backend into feature/create-edit-courses Vitaly Baev 2018-02-12 13:38:53 +0300
  • 2a7bae9707 Fix gallery Ivlev Denis 2018-02-12 13:29:37 +0300
  • dc47455cf1 Fix user ordering Ivlev Denis 2018-02-12 12:30:31 +0300
  • 0f3face083 Fix email attention Ivlev Denis 2018-02-12 12:28:43 +0300
  • 41b166fd91 Merge branch 'feature/api' of gitlab.com:lilcity/backend into feature/create-edit-courses Vitaly Baev 2018-02-12 12:00:49 +0300
  • cc992da75f Merge branch 'feature/api' into feature/courses Ivlev Denis 2018-02-12 12:00:26 +0300
  • 32b5eac244 Fix Gallery save Ivlev Denis 2018-02-12 11:59:57 +0300
  • 47eb703ed9 Include content to Course page Ivlev Denis 2018-02-12 11:54:34 +0300
  • 0d11648ed8 LIL-225. Add templates for content blocks Ivlev Denis 2018-02-12 11:54:13 +0300
  • b0fd24d4c8 Add ctype method for Content model Ivlev Denis 2018-02-12 11:53:02 +0300
  • 32127ce03a Fix admin for content Ivlev Denis 2018-02-12 11:52:19 +0300
  • 06a6c4a8e0 Merge branch 'feature/api' of gitlab.com:lilcity/backend into feature/create-edit-courses Vitaly Baev 2018-02-12 10:58:24 +0300
  • 995749ef04 Fix serializer fields Ivlev Denis 2018-02-12 09:48:15 +0300
  • 6e1073dd2c Add type to serializers Ivlev Denis 2018-02-12 09:46:07 +0300
  • b9915d2e2b Fix gallery admin Ivlev Denis 2018-02-12 09:05:57 +0300
  • 9d6cf16bcc Add gallery handler for create with course Ivlev Denis 2018-02-12 09:05:41 +0300
  • 4b913d2f1c Add gallery handler for create with course Ivlev Denis 2018-02-12 09:05:12 +0300
  • 976fe9191d Fix gallery field of Course model Ivlev Denis 2018-02-12 09:04:37 +0300
  • b4de8828bf Fix gallery modela Ivlev Denis 2018-02-12 09:03:39 +0300
  • 104f84ec8d Fix settings Ivlev Denis 2018-02-09 22:46:28 +0300
  • 565dc3a3f0 Fix formating Ivlev Denis 2018-02-09 22:46:05 +0300
  • d19033ea08 Add gallery to select_related Ivlev Denis 2018-02-09 22:45:45 +0300
  • 181ba1c9b7 Update Course and gallery serializers Ivlev Denis 2018-02-09 22:12:09 +0300
  • 24c31b314a Fix gallery model Ivlev Denis 2018-02-09 22:11:04 +0300
  • b1eac3b9e3 Minimize code Ivlev Denis 2018-02-09 21:06:47 +0300
  • 187906398b Update lesson serializer Ivlev Denis 2018-02-09 19:13:15 +0300
  • 04bb360365 Merge branch 'feature/api' of gitlab.com:lilcity/backend into feature/create-edit-courses Vitaly Baev 2018-02-09 18:50:35 +0300
  • 15f5d3b9e8 Remove unique from Content model Ivlev Denis 2018-02-09 18:50:18 +0300
  • 62de71c330 Merge branch 'feature/api' of gitlab.com:lilcity/backend into feature/create-edit-courses Vitaly Baev 2018-02-09 18:47:10 +0300
  • 6f70383649 Fix ImageObject structure Ivlev Denis 2018-02-09 18:46:52 +0300
  • a79af4c2a1 Merge branch 'feature/api' of gitlab.com:lilcity/backend into feature/create-edit-courses Vitaly Baev 2018-02-09 18:36:55 +0300
  • 8030323836 Check if id is None Ivlev Denis 2018-02-09 18:34:32 +0300
  • 7e32eb4434 Fix tupos in var names Ivlev Denis 2018-02-09 18:18:16 +0300
  • 1c959766e8 Merge branch 'feature/api' of gitlab.com:lilcity/backend into feature/create-edit-courses Vitaly Baev 2018-02-09 18:02:43 +0300
  • 2686c27022 Exclude self in Course save Ivlev Denis 2018-02-09 17:39:02 +0300
  • 299151474e Fix django.db.utils.DataError: value too long for type character varying(100) Ivlev Denis 2018-02-09 17:37:07 +0300
  • 4eaeea9243 Fix errors Ivlev Denis 2018-02-09 17:03:56 +0300
  • 688a1bbeec Merge branch 'feature/api' of gitlab.com:lilcity/backend into feature/create-edit-courses Vitaly Baev 2018-02-09 16:28:08 +0300
  • e53dfae45c Fix material cover id Ivlev Denis 2018-02-09 15:27:53 +0300
  • a7b70011ce Clean not needed Ivlev Denis 2018-02-09 15:23:15 +0300
  • 80b7a3c3df Fix Content ImageText choices key Ivlev Denis 2018-02-09 15:20:17 +0300
  • 7f182f482a Add /users/me/ endpoint Ivlev Denis 2018-02-09 15:17:07 +0300
  • aa5a820ce7 Merge branch 'feature/api' of gitlab.com:lilcity/backend into feature/create-edit-courses Vitaly Baev 2018-02-09 15:05:30 +0300
  • 35e44ed93e Fix user fixture, admin@lil.city now have admin role Ivlev Denis 2018-02-09 15:01:58 +0300
  • cbdeb0e2be Only admin users obtain tocken Ivlev Denis 2018-02-09 14:24:45 +0300
  • 5e7f57857b Add custom view for obtain token Ivlev Denis 2018-02-09 14:04:34 +0300
  • f07dff7dcd Add api-token-auth endpoint Ivlev Denis 2018-02-09 13:25:07 +0300
  • 81a2f0e5c2 Add default value for slug uuid4 Ivlev Denis 2018-02-09 13:19:31 +0300
  • e24efc7f6d Fix saving Course model Ivlev Denis 2018-02-09 13:07:44 +0300
  • ed0e0fa34a Fix fixtures Ivlev Denis 2018-02-09 12:46:38 +0300
  • 7458202bb7 Add route for retrieve course by slug Ivlev Denis 2018-02-09 12:46:27 +0300
  • 9b607487f2 Fix Course admin Ivlev Denis 2018-02-09 12:46:03 +0300
  • 38e0ed1f32 Add fiel list to ContentSerializer Ivlev Denis 2018-02-09 12:45:42 +0300
  • 52481c4bbb Add slug field Ivlev Denis 2018-02-09 12:45:25 +0300
  • 34c22321f9 Set ull field to read only Ivlev Denis 2018-02-09 11:19:24 +0300
  • 8527a8b847 Clean not needed import Ivlev Denis 2018-02-09 11:18:44 +0300
  • b89c4a86d2 Remove url field from Course model? and use get_absolute_url method Ivlev Denis 2018-02-09 11:18:11 +0300
  • 1c89854f91 Merge branch 'feature/api' of gitlab.com:lilcity/backend into feature/create-edit-courses Vitaly Baev 2018-02-09 11:13:31 +0300
  • 3cb7c327a5 Fix Base64ImageField Ivlev Denis 2018-02-09 11:12:11 +0300
  • 2f44392e4c Merge branch 'feature/api' of gitlab.com:lilcity/backend into feature/create-edit-courses Vitaly Baev 2018-02-09 11:08:23 +0300