Commit Graph

  • c95566c634 CSS fixes All courses category fix nikita 2018-05-11 21:33:46 +0300
  • 6c046a6fdc Fix video class Ivlev Denis 2018-05-11 15:25:47 +0300
  • f63b84ff13 Add video block to main page Ivlev Denis 2018-05-11 15:24:05 +0300
  • dfc0e6956f Update button in game block Ivlev Denis 2018-05-11 14:52:08 +0300
  • 17a6516bd7 Update gallery styles Ivlev Denis 2018-05-11 14:35:53 +0300
  • 007ea75977 Update success school buy message Ivlev Denis 2018-05-11 14:30:25 +0300
  • d754b63814 Merge branch 'dev' into 'master' Ivlev Denis 2018-05-11 10:38:18 +0000
  • 5d8111c92f Fix calc discount Ivlev Denis 2018-05-11 13:36:46 +0300
  • bd6aea011a Update school buy logic Ivlev Denis 2018-05-11 13:05:39 +0300
  • 5a7add83df Merge branch 'dev' into 'master' Ivlev Denis 2018-05-11 09:33:52 +0000
  • 1af2203a09 Bump lib versions Ivlev Denis 2018-05-11 12:33:08 +0300
  • 89b07ae1d4 Merge branch 'dev' into 'master' Ivlev Denis 2018-05-11 09:25:34 +0000
  • 02b3e9572d Add messages to empty user profile tabs Ivlev Denis 2018-05-11 12:21:32 +0300
  • d47a09bf9e Update school buy popup Ivlev Denis 2018-05-11 12:21:04 +0300
  • d848b45b54 Merge branch 'dev' into 'master' cfwme 2018-05-10 20:34:30 +0000
  • 67f8e8a104 Merge remote-tracking branch 'origin/dev' into dev nikita 2018-05-10 23:34:08 +0300
  • ec23392256 CSS improvements nikita 2018-05-10 23:33:08 +0300
  • d047409fce Fix school current day in profile Ivlev Denis 2018-05-10 18:51:58 +0300
  • 5bb69f727b Merge branch 'dev' into 'master' cfwme 2018-05-10 15:34:56 +0000
  • a7ad7800fe Merge branch 'dev' of gitlab.com:lilcity/backend into dev Ivlev Denis 2018-05-10 18:30:33 +0300
  • 436cb3ad86 Update school in user profile Ivlev Denis 2018-05-10 18:29:48 +0300
  • 678686553b Merge branch 'dev' into 'master' cfwme 2018-05-10 15:04:23 +0000
  • a506c750f2 Merge remote-tracking branch 'origin/dev' into dev nikita 2018-05-10 18:01:06 +0300
  • bc1bac7c38 External urls fix nikita 2018-05-10 18:00:49 +0300
  • d3a669bc88 Merge branch 'dev' into 'master' Ivlev Denis 2018-05-10 14:43:14 +0000
  • b261ee692d Fix update photo from fb Ivlev Denis 2018-05-10 17:41:18 +0300
  • fa59d529de Merge branch 'dev' into 'master' Ivlev Denis 2018-05-10 14:26:56 +0000
  • 12a3d528e8 Fix online Ivlev Denis 2018-05-10 17:26:02 +0300
  • b41f8b627f Add DisallowedPingbackHost exception Ivlev Denis 2018-05-10 17:12:53 +0300
  • 6cc4bcb6e8 CI root 2018-05-10 16:47:34 +0300
  • 49a35d3840 CI root 2018-05-10 16:45:52 +0300
  • b82582263c Merge branch 'dev' into 'master' Ivlev Denis 2018-05-10 13:40:56 +0000
  • ad002c15c1 Fix _create_user Ivlev Denis 2018-05-10 16:17:03 +0300
  • 47974e0710 CI root 2018-05-10 14:24:48 +0300
  • e3396acbd0 Update profile school qs Ivlev Denis 2018-05-10 12:56:45 +0300
  • 4cc52836e9 Revert school tab in user profile Ivlev Denis 2018-05-10 12:48:59 +0300
  • 4e07392354 Update payment qs in api Ivlev Denis 2018-05-10 12:34:22 +0300
  • a1b90d9082 Update payment all qs Ivlev Denis 2018-05-10 12:31:24 +0300
  • a7baef7a20 Fix user payments template Ivlev Denis 2018-05-10 12:31:00 +0300
  • 4359250cbb Raise exception if pingback not valid Ivlev Denis 2018-05-10 11:42:22 +0300
  • 07c11cf926 real ip fix root 2018-05-10 11:35:20 +0300
  • 0f324507da exclude git from deploy root 2018-05-08 20:43:46 +0300
  • e35be818fb Merge branch 'dev' of gitlab.com:lilcity/backend into dev Ivlev Denis 2018-05-08 19:08:34 +0300
  • 2a5ca2bbd6 Fix check online Ivlev Denis 2018-05-08 19:08:13 +0300
  • 2155270024 Merge branch 'dev' into 'master' cfwme 2018-05-08 15:30:38 +0000
  • 643482cbbc Typo fix nikita 2018-05-08 18:29:19 +0300
  • 9a35866ba3 Merge branch 'dev' of gitlab.com:lilcity/backend into dev Ivlev Denis 2018-05-08 18:05:42 +0300
  • 81ec1d1b98 Update live lessons list template Ivlev Denis 2018-05-08 18:05:21 +0300
  • 076bc32cbb Merge branch 'dev' into 'master' cfwme 2018-05-08 14:40:23 +0000
  • 0b98328aac Merge remote-tracking branch 'origin/dev' into dev nikita 2018-05-08 17:39:02 +0300
  • 3f9e17feca Blog link fixed nikita 2018-05-08 17:38:38 +0300
  • cc040d9161 clean Ivlev Denis 2018-05-08 16:10:00 +0300
  • 141d4cb0fd Add avatar to 404 Ivlev Denis 2018-05-08 16:08:42 +0300
  • e996cb72fb clean Ivlev Denis 2018-05-08 16:03:22 +0300
  • 668316573b Update 404 Ivlev Denis 2018-05-08 16:02:42 +0300
  • 35f3d589c5 Update 404 page styles Ivlev Denis 2018-05-08 16:01:31 +0300
  • 6f8b3b13c7 Add 404 page Ivlev Denis 2018-05-08 15:56:03 +0300
  • e6d2fbc15e Add "all courses" menu item Ivlev Denis 2018-05-08 15:36:28 +0300
  • 700d38e320 Add reload link to live lesson page Ivlev Denis 2018-05-08 15:13:16 +0300
  • e248e93cb4 Fix email subject Ivlev Denis 2018-05-08 14:55:47 +0300
  • 67c927809b Set clickable user menu avatar Ivlev Denis 2018-05-08 14:29:06 +0300
  • c0a306f6b1 Fix sharing Ivlev Denis 2018-05-08 14:18:46 +0300
  • af64b946f6 nginx real_ip root 2018-05-08 14:11:00 +0300
  • f1b87612fd Fix course sharing Ivlev Denis 2018-05-08 13:17:30 +0300
  • f607467c8b Update partner logos Ivlev Denis 2018-05-08 12:39:13 +0300
  • 5800951d83 Set default ordering for PaymentViewSet Ivlev Denis 2018-05-08 11:22:33 +0300
  • 16f687fadd Fix filter in PaymentViewSet Ivlev Denis 2018-05-08 11:01:35 +0300
  • 229da04875 Update default Mikhail Lavkin 2018-05-08 07:59:22 +0000
  • 41b2fd10b6 Auto assign username Ivlev Denis 2018-05-08 10:26:00 +0300
  • d61bb2e391 Auto assign username Ivlev Denis 2018-05-08 10:23:24 +0300
  • 300a883213 Set username read only Ivlev Denis 2018-05-08 10:18:57 +0300
  • 62fce3c6ae Update check online Ivlev Denis 2018-05-08 08:56:51 +0300
  • a416750777 Merge branch 'dev' into 'master' cfwme 2018-05-07 15:49:27 +0000
  • c7d76cf6a2 Center stream video & chat Ivlev Denis 2018-05-07 18:04:26 +0300
  • 7eeefa4a07 Add blink to online dot Ivlev Denis 2018-05-07 17:54:47 +0300
  • 04974b93fd No fixtures for prod. Mikhail Lavkin 2018-05-07 14:41:37 +0000
  • 7363d51eea Resize mif logo Ivlev Denis 2018-05-07 17:02:32 +0300
  • c5bb8d2344 Crop mif logo Ivlev Denis 2018-05-07 16:57:37 +0300
  • 1acb25bdad Update partners Ivlev Denis 2018-05-07 16:42:25 +0300
  • 717d497010 Merge branch 'dev' into 'master' cfwme 2018-05-07 12:20:04 +0000
  • eca16b17af Fix lesson perms Ivlev Denis 2018-05-07 14:49:35 +0300
  • 93bb4fbfa6 Add distinct Ivlev Denis 2018-05-07 14:23:37 +0300
  • ff0e4934f4 Show category if his have course Ivlev Denis 2018-05-07 14:22:10 +0300
  • 178a7a4892 Update LiveLessonSerializer Ivlev Denis 2018-05-07 13:53:31 +0300
  • 0ed0662b98 Merge branch 'dev' of gitlab.com:lilcity/backend into dev Ivlev Denis 2018-05-07 13:24:07 +0300
  • 5e104c667b Update check is stream present Ivlev Denis 2018-05-07 13:23:08 +0300
  • 4d5083fa83 school lesson mobile size Sanasol 2018-05-07 13:04:16 +0300
  • c3e898fc44 autosize lesson description Sanasol 2018-05-07 12:39:32 +0300
  • ef4b57bb4a select 7-10 days Sanasol 2018-05-07 12:25:07 +0300
  • dbdd1852bd Fix course items overlay priority Ivlev Denis 2018-05-07 12:00:12 +0300
  • 89cac5f1b5 Fix school logo in buy popup Ivlev Denis 2018-05-07 11:51:27 +0300
  • 202c47b81a Fix active link in header Ivlev Denis 2018-05-07 11:20:14 +0300
  • e572bbfa80 Don't use tz Ivlev Denis 2018-05-07 11:14:13 +0300
  • 1e572f43a6 Merge branch 'dev' of gitlab.com:lilcity/backend into dev Ivlev Denis 2018-05-07 10:44:50 +0300
  • f202aea548 User menu in own template Ivlev Denis 2018-05-07 10:44:16 +0300
  • 846cee4181 Fix live lessons serializers Ivlev Denis 2018-05-07 10:43:37 +0300
  • 326d3c9e37 role check, users email Sanasol 2018-05-07 10:39:48 +0300
  • 20be511cc3 CI root 2018-05-06 23:19:02 +0300
  • ad1c3e6e6f CI root 2018-05-06 23:15:08 +0300
  • 03a55b4686 CI root 2018-05-06 23:14:09 +0300