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

Commit Graph

  • ac9f1721d7 Merge branch 'feature/improve-login-form' into dev Vitaly Baev 2018-01-28 20:57:45 +0300
  • c2a7d8e790 LIL-87 - Улучшение формы входа/регистрации Vitaly Baev 2018-01-28 20:57:35 +0300
  • e974996334 Merge branch 'feature/lil-95-course-like-front' into dev Vitaly Baev 2018-01-28 20:41:05 +0300
  • dae90676e9 LIL-95 - Возможность поставить лайк курсу (фронт) Vitaly Baev 2018-01-28 20:37:49 +0300
  • 8e8dea3c55 Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-01-28 20:03:45 +0300
  • e8c395bf07 Merge branch 'feature/courses' into dev Ivlev Denis 2018-01-28 19:13:03 +0300
  • 485517be75 LIL-100 Fix handler Ivlev Denis 2018-01-28 19:12:35 +0300
  • 7fed1cc9c1 Merge branch 'feature/courses' into dev Ivlev Denis 2018-01-28 18:17:02 +0300
  • 54544fb9ef LIL-100 Обработчик лайков Ivlev Denis 2018-01-28 18:16:20 +0300
  • 7d212f0a48 LIL-99 Создание модели "лайков" Ivlev Denis 2018-01-28 17:51:59 +0300
  • 12554ec093 Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-01-28 16:03:55 +0300
  • 5bed4a0379 LIL-90 LIL-89 - Подгрузка и фильтрация курсов Vitaly Baev 2018-01-28 16:03:44 +0300
  • 77bf4dcfb0 Fix Course template Ivlev Denis 2018-01-28 15:49:41 +0300
  • 7045f45725 Merge branch 'feature/courses' into dev Ivlev Denis 2018-01-28 15:43:43 +0300
  • e84687b265 Fix Course pagination urls Ivlev Denis 2018-01-28 15:43:15 +0300
  • 55ee199364 Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-01-28 15:14:20 +0300
  • cbdbc5ac48 Merge branch 'feature/courses' into dev Ivlev Denis 2018-01-28 15:13:50 +0300
  • 4f72ca82af Update CoursesView ajax response Ivlev Denis 2018-01-28 15:13:07 +0300
  • 558988e2b3 Add Course ordering by created_at Ivlev Denis 2018-01-28 15:11:43 +0300
  • bbf5df952e Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-01-28 14:50:10 +0300
  • 277abce53c Add new superuser mixin for dev time Ivlev Denis 2018-01-28 13:42:21 +0300
  • cdf1b366bd Merge branch 'feature/courses' into dev Ivlev Denis 2018-01-28 11:24:43 +0300
  • 65eae9a552 Remove not needed migration Ivlev Denis 2018-01-28 11:16:09 +0300
  • 6bd9bf13f0 Merge branch 'feature/user_update' into feature/authentication Ivlev Denis 2018-01-28 09:55:58 +0300
  • a96244cb87 Merge branch 'feature/mainpage' into feature/user_update Ivlev Denis 2018-01-28 09:49:54 +0300
  • e0c3862e8c Fix User REQUIRED_FIELDS Ivlev Denis 2018-01-28 09:47:17 +0300
  • bb390d6083 Add verbose names for User fields Ivlev Denis 2018-01-27 19:16:47 +0300
  • b9ef367c6d Migrate to new user model Ivlev Denis 2018-01-27 19:09:51 +0300
  • 87c0ebb290 Add main page Ivlev Denis 2018-01-27 17:38:41 +0300
  • 6173b8803c Add course picture only on dev time Ivlev Denis 2018-01-27 11:37:37 +0300
  • 071c9d0202 Add courses fixture Ivlev Denis 2018-01-27 11:36:32 +0300
  • a9286281c7 Fix Couce filterset Ivlev Denis 2018-01-27 11:35:47 +0300
  • 0a9dbf4dd7 Fix db locale Ivlev Denis 2018-01-27 11:35:04 +0300
  • edf7c7ade1 Move from postgres:9.6.3 to postgres:10-alpine Ivlev Denis 2018-01-27 10:06:18 +0300
  • 9a380454a4 LIL-116. Реализовать выпадающий список категорий курсов в главном шаблоне Ivlev Denis 2018-01-26 20:17:56 +0300
  • 94956bbf21 Add django-filter to req Ivlev Denis 2018-01-26 19:17:52 +0300
  • 8015c118d7 LIL-116. Реализовать выпадающий список курсов в главном шаблоне Ivlev Denis 2018-01-26 18:42:14 +0300
  • 7d9e73e5b2 LIL-118. Обновить шаблон курса Ivlev Denis 2018-01-26 18:41:14 +0300
  • 6e572c8095 Add arrow library Ivlev Denis 2018-01-26 18:38:21 +0300
  • abf65db714 Fix Course admin Ivlev Denis 2018-01-26 18:37:56 +0300
  • f72d600498 LIL-117. Обновить модель курсов Ivlev Denis 2018-01-26 18:37:06 +0300
  • 1075062f16 LIL-116. Реализовать выпадающий список курсов в главном шаблоне Ivlev Denis 2018-01-26 18:32:29 +0300
  • 61bb74445d LIL-112. Исправить регистрацию по существующему e-mail Ivlev Denis 2018-01-26 13:42:51 +0300
  • 1bd5960fd4 Fix migrations Ivlev Denis 2018-01-26 12:30:25 +0300
  • 8a47b077cb Add autoload fixtures to docker-compose Ivlev Denis 2018-01-26 12:30:08 +0300
  • 98fd07469e Add fixture for superuser Ivlev Denis 2018-01-26 12:29:32 +0300
  • a9c98bd942 Add vscode config dir to .gitignore Ivlev Denis 2018-01-26 11:50:32 +0300
  • 6aa3acdd8c Merge branch 'feature/created_courses' into 'master' cfwme 2018-01-26 08:27:30 +0000
  • 854f102ada Merge branch 'master' into feature/created_courses nikita 2018-01-26 11:15:13 +0300
  • a11144a5a8 Merge branch 'feature/lil-90-loading-courses-front' into 'master' cfwme 2018-01-26 07:59:50 +0000
  • 4cd4930da7 Подгрузка курсов Vitaly Baev 2018-01-26 10:55:25 +0300
  • 912733db6f Updated ER diagram nikita 2018-01-26 07:28:05 +0300
  • 1e613cfeb0 Added main page menu links highlighting nikita 2018-01-26 07:20:25 +0300
  • b14481e396 LIL-84 Add migration Sergey G 2018-01-22 16:45:19 +0500
  • 602361e34a LIL-84 Rename `_course-item.html` => `_items.html` Sergey G 2018-01-22 16:42:44 +0500
  • 29ce0b5da4 LIL-97 Show category from db Sergey G 2018-01-22 16:37:22 +0500
  • e84fb41166 LIL-97 Move `_courses_item.html` => `templates/lilcity` Move `course_items.html` => `templates/lilcity` Move `courses.html` => `templates/lilcity` Sergey G 2018-01-22 16:22:18 +0500
  • 64d025eacc LIL-97 Show category from db Sergey G 2018-01-22 16:19:44 +0500
  • 7f3fb2b4b4 LIL-87 Front-end Регистрация, авторизация пользователя и восстановление пароля Vitaly Baev 2018-01-22 14:19:30 +0300
  • 97446780dd LIL-94 Add model `Category` Sergey G 2018-01-22 16:00:53 +0500
  • 861b0296f7 LIL-98 Add pagination for course Sergey G 2018-01-22 15:42:32 +0500
  • 3d3d6eb8c6 LIL-91 Add field `Course.updated_at` and `Course.created_at` Sergey G 2018-01-22 15:08:53 +0500
  • 10c2b53ee6 LIL-92 close Sergey G 2018-01-22 15:04:51 +0500
  • c3b29c5113 LIL-94 Change category color Sergey G 2018-01-22 15:00:22 +0500
  • 739fdd63b8 LIL-94 Show price Sergey G 2018-01-22 14:49:01 +0500
  • f533fa8ec8 LIL-94 Show timer if course deferred start Sergey G 2018-01-22 14:48:40 +0500
  • 475cebbd8f LIL-94 Added model "Course" Sergey G 2018-01-22 14:39:16 +0500
  • 62a8ad7e8b LIL-94 Add `Pillow==5.0.0` Sergey G 2018-01-22 13:59:01 +0500
  • 1743f8cc23 Добавление заголовка против CSRF ко всем AJAX запросам JQuery Vitaly Baev 2018-01-22 10:23:11 +0300
  • 719fa0fe5e LIL-107 Настройка работы с JavaScript при помощи webpack + Babel Vitaly Baev 2018-01-22 10:00:27 +0300
  • 3fbe083eb3 Добавлены правила в .gitignore для JavaScript Vitaly Baev 2018-01-22 09:59:49 +0300
  • f0e2c2c26b Обозначена версия Python в документацию Vitaly Baev 2018-01-20 12:07:31 +0300
  • 6fcfcfc9cc Added version python Sergey G 2018-01-19 12:52:39 +0500
  • c500abb021 LIL-27 Login/registration for facebook Sergey G 2018-01-19 12:35:44 +0500
  • 6f05b5823c Add admin model `LilcityUserSettings` Sergey G 2018-01-19 12:34:47 +0500
  • 8364af6e2c Main page Sergey G 2018-01-19 10:41:26 +0500
  • d08c5b7305 LIL-61 build html directory added nikita 2018-01-18 15:26:13 +0300
  • cc6f15f3d1 LIL-61 common layouts, ui-kit, email template added nikita 2018-01-17 17:56:21 +0300
  • b57b69402f LIL-57, LIL-59, LIL-62 docs markdown fixes nikita 2018-01-17 17:38:42 +0300
  • a9f23be3a7 LIL-57, LIL-59, LIL-62 docs added nikita 2018-01-17 17:31:04 +0300
  • c3fc358728 LIL-75 Add docker-compose.yml Sergey G 2018-01-17 17:33:32 +0500
  • b692162e95 LIL-66 Added token and account for Twilio service Sergey G 2018-01-16 15:33:44 +0500
  • 702418b1d6 LIL-70 Added reset password Sergey G 2018-01-16 14:38:39 +0500
  • ff306d2378 LIL-74 Added `twilio` Sergey G 2018-01-16 10:35:34 +0500
  • af5492c797 LIL-74 Added `paymentwall` Sergey G 2018-01-15 23:13:44 +0500
  • b828933d64 LIL-73 Use html template Sergey G 2018-01-15 22:42:37 +0500
  • 5853ce29b8 LIL-72 Save verification email or not Sergey G 2018-01-15 13:50:45 +0500
  • 9a8b14e5d8 LIL-72 Added logic for verification email Sergey G 2018-01-12 16:33:34 +0500
  • fa1cd8b24b LIL-65 Replace custom `notification/email` => `django-anymail[mailgun]` Sergey G 2018-01-12 14:56:16 +0500
  • 5b9442b0b4 LIL-68 Авторизуем пользователя при успешной регистрации Sergey G 2018-01-11 18:01:15 +0500
  • de2d95201a LIL-69 Add login Sergey G 2018-01-11 17:54:00 +0500
  • b8478ea2c8 LIL-71 Use logout Sergey G 2018-01-11 17:37:02 +0500
  • 513166847c LIL-68 Added registration page Sergey G 2018-01-11 17:12:17 +0500
  • 95851f3a11 Added simple send email Sergey G 2018-01-09 17:41:26 +0500
  • f3548cd046 Added `Django` Sergey G 2018-01-09 17:18:09 +0500
  • 2182e4f5be Add `.gitignore` Sergey G 2018-01-09 16:47:39 +0500