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

Commit Graph

  • 44f9e2859c selected days display Sanasol 2018-02-28 22:39:20 +0700
  • ce2d76b505 popup link Sanasol 2018-02-28 22:30:17 +0700
  • 2a8dc4d0ea [LIL-258][LIL-262][LIL-265] Sanasol 2018-02-28 22:14:30 +0700
  • 74518cba34 Merge branch 'feature/payments' into dev Ivlev Denis 2018-02-28 17:25:06 +0300
  • 81163bdff5 Add day_discount field to SchoolScheduleSerializer Ivlev Denis 2018-02-28 17:24:56 +0300
  • 1de7908705 Merge branch 'feature/payments' into dev Ivlev Denis 2018-02-28 14:05:41 +0300
  • 9abc660202 LIL-263. Add cause field to AuthorBalanceSerializer Ivlev Denis 2018-02-28 14:05:30 +0300
  • e40066e809 Merge branch 'feature/payments' into dev Ivlev Denis 2018-02-28 14:03:42 +0300
  • f967b4de47 LIL-263. Add cause field to AuthorBalance model Ivlev Denis 2018-02-28 14:03:21 +0300
  • 0590e7aa42 Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-02-28 12:10:13 +0300
  • 1da7040292 Fix user balance Ivlev Denis 2018-02-27 15:30:51 +0300
  • 866ec81807 LIL-264. Add author balance api Ivlev Denis 2018-02-27 13:04:45 +0300
  • 4efacf43bf Update school schedules in main page Ivlev Denis 2018-02-27 12:50:16 +0300
  • c371da90c3 update link for buy school Ivlev Denis 2018-02-27 12:45:42 +0300
  • 9409aa20d2 Allow null for start & end date of SchoolPayment Ivlev Denis 2018-02-27 12:45:09 +0300
  • 92789d8517 Show SchoolSchedule's in school buy popup Ivlev Denis 2018-02-27 09:55:11 +0300
  • e797ab6b29 Show messages in main page Ivlev Denis 2018-02-27 09:54:34 +0300
  • 5205198d6a Add SchoolBuyView route & SchoolSchedule's to main page Ivlev Denis 2018-02-27 09:53:53 +0300
  • 8948d503a0 Add SchoolBuyView Ivlev Denis 2018-02-27 09:53:09 +0300
  • 5a29df9635 Update payments admin Ivlev Denis 2018-02-27 09:52:49 +0300
  • f395a5efb5 LIL-268. Fix course payment buttons Ivlev Denis 2018-02-26 21:30:32 +0300
  • f3b61db782 LIL-268, LIL-269. Hide payment button Ivlev Denis 2018-02-26 21:20:08 +0300
  • c1e84a4ce5 Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-02-26 18:15:35 +0300
  • e49f1370ee LIL-274. Add PW callback view Ivlev Denis 2018-02-26 15:11:56 +0300
  • 32c97d6887 LIL-271. Fix AuthorBalance model Ivlev Denis 2018-02-26 15:08:55 +0300
  • bfa6458eeb LIL-271. Update AuthorBalance model Ivlev Denis 2018-02-26 15:05:55 +0300
  • 67c5d73a47 LIL-274. Fix product name Ivlev Denis 2018-02-26 12:16:09 +0300
  • 18f03ba824 LIL-274. Fix succes & error urls Ivlev Denis 2018-02-26 12:15:32 +0300
  • 642994195c Fix purchased courses list in profile Ivlev Denis 2018-02-26 11:16:48 +0300
  • 8a0cd6bf81 LIL-268, LIL-274. Add buy templates & integrate paymentwall widget Ivlev Denis 2018-02-22 15:43:23 +0300
  • 6e204263a5 LIL-278. Add day_discount field to SchoolSchedule & fix calc SchoolPayment amount Ivlev Denis 2018-02-22 13:08:56 +0300
  • 8a1a51b4f7 LIL-268. Show purchased courses in profile page Ivlev Denis 2018-02-22 12:56:23 +0300
  • 8ba76c5ae6 LIL-271. Fix balance calc & add balance to user serializer Ivlev Denis 2018-02-22 12:39:01 +0300
  • 6e4e50c01a LIL-270. Fix payment history template Ivlev Denis 2018-02-22 11:46:52 +0300
  • e82fb4ac49 LIL-271. Add service commission settings Ivlev Denis 2018-02-21 17:13:08 +0300
  • fa2b848715 merge dev Ivlev Denis 2018-02-21 17:01:01 +0300
  • 8f39d0a957 merge feature/instagram Ivlev Denis 2018-02-21 16:59:28 +0300
  • 07c825f6b0 LIL-270. Update user payment page Ivlev Denis 2018-02-21 16:36:20 +0300
  • 0408cf137a LIL-270. Fix balance link in user menu Ivlev Denis 2018-02-21 16:35:27 +0300
  • 43e9ac4625 LIL-271. Add balance sum func & show in user menu for author & admin Ivlev Denis 2018-02-21 16:05:35 +0300
  • 943b609fac LIL-271. Add related name for AuthorBalance author field Ivlev Denis 2018-02-21 16:04:32 +0300
  • f53daf4525 LIL-267, LIL-271. Fix summary price Ivlev Denis 2018-02-21 15:51:39 +0300
  • 01b163d05d LIL-267, LIL-271. Update payment models Ivlev Denis 2018-02-21 15:07:04 +0300
  • cbc013f238 SchoolSchedule weekday unique Ivlev Denis 2018-02-21 14:20:15 +0300
  • 5242501e82 LIL-271. Add AuthorBalance models Ivlev Denis 2018-02-21 13:25:27 +0300
  • 70f07e602b merge dev Ivlev Denis 2018-02-21 13:09:58 +0300
  • 724793ab14 Fix Category ordering for admin site Ivlev Denis 2018-02-21 12:19:42 +0300
  • acb43aa16e LIL-256. Add serializer, viewset & route for SchoolSchedule Ivlev Denis 2018-02-21 12:03:27 +0300
  • b0e6f68fe2 Fix tupos Ivlev Denis 2018-02-21 12:02:24 +0300
  • e8e1fc75e9 LIL-256. Add age field to SchoolSchedule Ivlev Denis 2018-02-21 11:22:56 +0300
  • 6473b7b8a7 LIL-267. Add admin for payments Ivlev Denis 2018-02-21 09:55:17 +0300
  • 221a637119 LIL-267. Fix SchoolPayment verbose name option Ivlev Denis 2018-02-21 09:54:45 +0300
  • 4099616355 Clean Ivlev Denis 2018-02-20 22:16:14 +0300
  • 8b4bf99dd4 LIL-267. Add payment models Ivlev Denis 2018-02-20 22:15:09 +0300
  • 448748285d LIL-76. Add patched paymentwall lib to req Ivlev Denis 2018-02-20 22:14:50 +0300
  • d38b47525a Add venvs to .dockerignore Ivlev Denis 2018-02-20 22:13:33 +0300
  • 80c6393100 LIL-256. Add app "school" & SchoolSchedule model. Ivlev Denis 2018-02-20 17:23:10 +0300
  • 38cbea0748 LIL-266. Add simple task for retrieve data by hashtag. Ivlev Denis 2018-02-20 16:53:22 +0300
  • fdd20f4ddb Merge branch 'feature/school-layout' into 'dev' Alex 2018-02-20 13:34:46 +0000
  • 126167db8a [LIL-279] layout profile school page Sanasol 2018-02-20 20:25:55 +0700
  • fc301cc8ac LIL-266. Add instagram settings Ivlev Denis 2018-02-20 15:41:41 +0300
  • 45f1dcfbf3 LIL-266. Move celery settings to main settings file. Ivlev Denis 2018-02-20 15:39:32 +0300
  • a2f00458b4 LIL-266. Fix celery app Ivlev Denis 2018-02-20 15:38:10 +0300
  • 265dc1ca44 LIL-16. Add instagram api lib to req Ivlev Denis 2018-02-20 15:36:50 +0300
  • 76da0b4371 LIL-266. Add celery worker service Ivlev Denis 2018-02-20 15:36:17 +0300
  • 09fe0298a8 LIL-16. Add django-constance[database] to req Ivlev Denis 2018-02-20 12:03:30 +0300
  • 1f39fc9811 LIL-276. Fix courses category bulk change endpoint. Ivlev Denis 2018-02-20 11:46:34 +0300
  • bc1438721c LIL-276. Add courses category bulk change endpoint. Ivlev Denis 2018-02-19 20:58:48 +0300
  • b68bdffe75 Update .gitignore Ivlev Denis 2018-02-19 11:54:31 +0300
  • 9165bff91a Add .editorconfig file Ivlev Denis 2018-02-16 09:52:27 +0300
  • 265ef52d0e Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-02-15 20:02:42 +0300
  • d76c11dde0 Использование ссылки со slug в превью Vitaly Baev 2018-02-15 20:02:26 +0300
  • bdf2882214 Fix slug Ivlev Denis 2018-02-15 19:38:25 +0300
  • 81597ab56b publish disabled fix Vitaly Baev 2018-02-15 19:37:42 +0300
  • 15a28ca3b5 Мелкие правки Vitaly Baev 2018-02-15 19:32:50 +0300
  • a70556494e Фикс выбора отложенного курса + дизейбл кнопок превью и опубликовать, пока курс не загрузится Vitaly Baev 2018-02-15 19:25:50 +0300
  • ac4139672c Фикс карета дропдауна Vitaly Baev 2018-02-15 19:24:48 +0300
  • cc9bd38c5a Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-02-15 19:12:16 +0300
  • 2baf917f88 slug + отправка курса на модерацию Vitaly Baev 2018-02-15 19:08:40 +0300
  • 726cda15bb Click on draft course open edit page Ivlev Denis 2018-02-15 19:06:11 +0300
  • ab0a538bd5 Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-02-15 18:35:14 +0300
  • 78f03f43bd Allow blank course slug Ivlev Denis 2018-02-15 18:34:42 +0300
  • 0483f745c6 Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-02-15 18:28:46 +0300
  • 9787d5933b Merge branch 'dev' of gitlab.com:lilcity/backend into dev Ivlev Denis 2018-02-15 18:24:08 +0300
  • 390ffb371b Course slug nullable Ivlev Denis 2018-02-15 18:23:57 +0300
  • 2296c159e4 Не обновлять кавер на клиенте после сохранения Vitaly Baev 2018-02-15 18:22:32 +0300
  • ef6c1b5066 Merge remote-tracking branch 'origin/dev' into dev Vitaly Baev 2018-02-15 18:01:59 +0300
  • 502d087be7 Fix dublication Ivlev Denis 2018-02-15 18:00:07 +0300
  • e1165a710c Fix user perms Ivlev Denis 2018-02-15 17:38:14 +0300
  • 577a12164c Allow any view course Ivlev Denis 2018-02-15 17:27:02 +0300
  • c6ab2c0772 Fix user perms Ivlev Denis 2018-02-15 17:24:25 +0300
  • 87d858a445 Fix user perms for course detail page Ivlev Denis 2018-02-15 17:00:12 +0300
  • 52cd3c49e8 Dont show lesson cover Ivlev Denis 2018-02-15 16:48:50 +0300
  • 9c31612757 Fix user social links & about Ivlev Denis 2018-02-15 16:27:40 +0300
  • 8a1e88d7c0 Delete play icon from cover Ivlev Denis 2018-02-15 16:24:28 +0300
  • fed8f83a8c LIL-251. Fix cover Ivlev Denis 2018-02-15 16:20:51 +0300
  • 3378d38874 Fixed size for course cover on courses page Ivlev Denis 2018-02-15 15:53:46 +0300
  • c451510407 Fix draft overlay Ivlev Denis 2018-02-15 15:48:57 +0300
  • fea237d71f Merge branch 'dev' of gitlab.com:lilcity/backend into dev Ivlev Denis 2018-02-15 15:47:11 +0300
  • f6a8d0eece Add title for draft course Ivlev Denis 2018-02-15 15:46:59 +0300