Commit Graph

  • 73c4c15fdb LIL-131 - Якоря для главного меню Vitaly Baev 2018-01-31 09:33:39 +0300
  • cb4fd391b3 Возврат формы комментирования над комментариями Vitaly Baev 2018-01-31 08:49:59 +0300
  • 1ae028cf15 Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-01-31 08:42:46 +0300
  • e0bf09aa75 LIL-144 Fix user profile styles Ivlev Denis 2018-01-30 22:22:03 +0300
  • 1e38811f75 Add link to user menu Ivlev Denis 2018-01-30 22:21:04 +0300
  • 10f4416a8b LIL-106. Add user profile template Ivlev Denis 2018-01-30 22:20:39 +0300
  • a16eeb0d12 LIL-141. Add user detail view Ivlev Denis 2018-01-30 22:19:53 +0300
  • bf491392cf Fix Course STATUS_CHOICES Ivlev Denis 2018-01-30 22:18:06 +0300
  • 0b962aa420 LIL-133, LIL-134 User menu & Logout Ivlev Denis 2018-01-30 20:59:26 +0300
  • f127693fd4 LIL-143. Add action for search form Ivlev Denis 2018-01-30 20:33:18 +0300
  • 45e32a2c1b Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-01-30 19:38:40 +0300
  • 8e52c0e9e8 LIL-140. Add game block to search result template Ivlev Denis 2018-01-30 19:33:37 +0300
  • 73030aedb3 LIL-22. Add index for title & short_description fields Course model Ivlev Denis 2018-01-30 19:32:49 +0300
  • ad35d4644b Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-01-30 19:32:01 +0300
  • 19510fd3c1 LIL-140. Add search result template Ivlev Denis 2018-01-30 19:09:16 +0300
  • eaa3cf7205 LIL-139. Add Serch view Ivlev Denis 2018-01-30 19:08:08 +0300
  • c35915acdb LIL-138. Update styles Ivlev Denis 2018-01-30 19:03:51 +0300
  • c35b42b6fa Exclude media Ivlev Denis 2018-01-30 16:56:37 +0300
  • edca4f3362 Add lock file for yarn Ivlev Denis 2018-01-30 16:55:57 +0300
  • 68f2dd6812 Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-01-30 16:37:52 +0300
  • 3833cb5701 Add user to comment context Ivlev Denis 2018-01-30 16:35:35 +0300
  • dc07ea518f Update front Ivlev Denis 2018-01-30 16:27:16 +0300
  • c0b71f4dd4 Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-01-30 16:05:44 +0300
  • 0b48a1f490 Merge branch 'feature/courses' into dev Ivlev Denis 2018-01-30 16:00:15 +0300
  • ed857f69a0 Limiting commenting only for logged users Ivlev Denis 2018-01-30 15:55:27 +0300
  • 4b077759b4 Add ordering migration Ivlev Denis 2018-01-30 15:49:19 +0300
  • a9ac86ea2b Change comments ordering Ivlev Denis 2018-01-30 15:47:51 +0300
  • 66fabf6849 LIL-96 Реализация комментария к лайку или курсу (фронт) Vitaly Baev 2018-01-30 15:24:14 +0300
  • 48c5a3bff3 Fix typos Ivlev Denis 2018-01-30 15:11:27 +0300
  • b194ae8640 Fix reply_id default Ivlev Denis 2018-01-30 14:58:32 +0300
  • 717a3386b2 Merge remote-tracking branch 'origin/feature/courses' into feature/courses Vitaly Baev 2018-01-30 14:56:36 +0300
  • 5ed68d44cc Merge branch 'feature/courses' into dev Ivlev Denis 2018-01-30 14:56:36 +0300
  • 0a0043cbdb Fix zero reply_id Ivlev Denis 2018-01-30 14:56:21 +0300
  • ec8887352d Merge remote-tracking branch 'origin/feature/courses' into feature/courses Vitaly Baev 2018-01-30 14:16:50 +0300
  • f2ec0cc544 Merge branch 'dev' of gitlab.com:lilcity/backend into dev Ivlev Denis 2018-01-30 13:41:07 +0300
  • a87e471b18 Merge branch 'feature/courses' into dev Ivlev Denis 2018-01-30 13:40:44 +0300
  • e7962bb00d Add comments handler Ivlev Denis 2018-01-30 13:40:11 +0300
  • 5e7057252d Split comments template Ivlev Denis 2018-01-30 13:39:38 +0300
  • 0d26cded09 LIL-93 Счетчик отложенных курсов Vitaly Baev 2018-01-30 12:02:00 +0300
  • 0a19ce76a5 LIL-109. Add simple template for lesson Ivlev Denis 2018-01-30 11:31:10 +0300
  • 92b7f502e9 Unification comment block Ivlev Denis 2018-01-30 11:20:46 +0300
  • cc61b14d15 Move parent field from Comment to own comment types Ivlev Denis 2018-01-30 11:14:47 +0300
  • 319a1070af Add detail view for lesson Ivlev Denis 2018-01-30 11:06:26 +0300
  • 1038a788dc Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-01-30 10:20:29 +0300
  • b6a1ea3a8b Merge branch 'feature/courses' into dev Ivlev Denis 2018-01-30 09:36:04 +0300
  • d3ec710866 Revert humanize time view for deferred course Ivlev Denis 2018-01-30 09:35:47 +0300
  • b72fbd18e3 Fix window title Ivlev Denis 2018-01-30 09:15:58 +0300
  • 0d9baa2535 Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-01-30 08:39:48 +0300
  • 29cbc1060d Updated Docker file for fastest rebuild Ivlev Denis 2018-01-30 08:37:46 +0300
  • 689fab3801 Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-01-30 08:27:41 +0300
  • 69edee2f45 Merge branch 'feature/courses' into dev Ivlev Denis 2018-01-30 08:27:18 +0300
  • 3d383241b4 Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-01-30 08:16:10 +0300
  • 28ab123154 Move commets block to separate file Ivlev Denis 2018-01-30 08:04:49 +0300
  • 9fc83089b7 Merge branch 'feature/courses' into dev Ivlev Denis 2018-01-29 21:29:05 +0300
  • e53a524c46 Add comments to course template Ivlev Denis 2018-01-29 21:28:06 +0300
  • caaaa90fb4 LIL-119 Create comments model Ivlev Denis 2018-01-29 21:27:25 +0300
  • 9919591ced LIL-119. Add mptt app to settings Ivlev Denis 2018-01-29 20:17:15 +0300
  • 50a3862594 LIL-119. Add django-mptt to req Ivlev Denis 2018-01-29 19:52:19 +0300
  • 186d1587c0 Fix course template Ivlev Denis 2018-01-29 19:08:28 +0300
  • c1c61f6e22 Add material list to course template Ivlev Denis 2018-01-29 18:29:03 +0300
  • ee20e92e93 Fix course model Ivlev Denis 2018-01-29 18:28:30 +0300
  • 261d8d3ba2 Fix material cover save path Ivlev Denis 2018-01-29 18:01:58 +0300
  • e045e50e57 LIL-126 Add Material model Ivlev Denis 2018-01-29 18:01:07 +0300
  • 4921c3fb0a Replace " to ' Ivlev Denis 2018-01-29 17:41:22 +0300
  • f79f4730f5 LIL-118. Show lessons in course detail view Ivlev Denis 2018-01-29 17:39:19 +0300
  • 8c6eea5a9c LIL-102. Создание модели урок Ivlev Denis 2018-01-29 17:37:38 +0300
  • 042f823597 Fix fb auth errors Ivlev Denis 2018-01-29 16:03:22 +0300
  • bd3904fb16 Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-01-29 16:02:33 +0300
  • 096f955cf8 Fix facebook id size Ivlev Denis 2018-01-29 16:00:29 +0300
  • 2dd1020be1 Правка верстки Vitaly Baev 2018-01-29 15:02:14 +0300
  • bf8c831bc6 LIL-95 - Исправление поведения лайков 3 Vitaly Baev 2018-01-29 15:02:08 +0300
  • bf8aeec8eb Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-01-29 13:50:59 +0300
  • 60159b51e9 Merge branch 'feature/courses' into dev Ivlev Denis 2018-01-29 13:28:34 +0300
  • d1ba212815 Add course detail url Ivlev Denis 2018-01-29 13:26:43 +0300
  • de6dbdef71 LIL-110. Создание шаблона django Ivlev Denis 2018-01-29 13:26:15 +0300
  • 17e24adfcf LIL-124. Представление(вьюха) курса Ivlev Denis 2018-01-29 13:23:19 +0300
  • 6304b2e513 Add migrate Ivlev Denis 2018-01-29 13:20:53 +0300
  • 7d561b46c7 Add from_author field to Course Ivlev Denis 2018-01-29 13:20:40 +0300
  • db3250aa7b Add links to detail view course Ivlev Denis 2018-01-29 13:20:15 +0300
  • c0821586ba Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-01-29 11:39:15 +0300
  • 4f533f22fa Merge branch 'dev' of gitlab.com:lilcity/backend into dev Ivlev Denis 2018-01-29 11:37:53 +0300
  • 1b6e040929 LIL-95 - Исправление поведения лайков 2 Vitaly Baev 2018-01-29 11:37:31 +0300
  • 58a79690e7 Merge branch 'dev' of gitlab.com:lilcity/backend into dev Ivlev Denis 2018-01-29 11:27:58 +0300
  • 867acc460d LIL-95 - Исправление поведения лайков Vitaly Baev 2018-01-29 11:27:22 +0300
  • 2c151c9bf1 Merge branch 'feature/courses' into dev Ivlev Denis 2018-01-29 11:13:10 +0300
  • e586848976 Fix like url Ivlev Denis 2018-01-29 11:12:53 +0300
  • 96ab4c8d10 LIL-88 Регистрация через Facebook (фронт) Vitaly Baev 2018-01-29 10:57:14 +0300
  • 2adae89b86 Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-01-29 10:13:10 +0300
  • c255cd9843 Merge branch 'feature/courses' into dev Ivlev Denis 2018-01-29 09:55:00 +0300
  • ef9e1baa8c Work on deferred courses Ivlev Denis 2018-01-29 09:54:11 +0300
  • a4705ef059 Add server time to base page head Ivlev Denis 2018-01-29 09:53:13 +0300
  • 994a459b26 Merge branch 'feature/courses' into dev Ivlev Denis 2018-01-29 09:29:47 +0300
  • 46bbdc0ac8 Update User model Ivlev Denis 2018-01-29 09:27:25 +0300
  • c1793d1ef2 Add user admin Ivlev Denis 2018-01-29 09:27:01 +0300
  • 73cbf6e1d5 Add course author photo Ivlev Denis 2018-01-29 08:43:24 +0300
  • 596333db2e Merge branch 'feature/user_update' into dev Ivlev Denis 2018-01-29 08:38:55 +0300
  • 92ffbfa6c3 Add photo field for User Ivlev Denis 2018-01-29 08:38:19 +0300
  • 15faae1ff8 Merge branch 'feature/courses' into dev Ivlev Denis 2018-01-29 08:28:15 +0300
  • d73851cb26 Remove backslash from likes url Ivlev Denis 2018-01-29 08:28:01 +0300
  • 6842b83192 LIL-88 Регистрация через Facebook Vitaly Baev 2018-01-28 21:30:46 +0300